The Unified and Autonomous Development Platform
Variable and script interpolation in CI job definition
Robin Shen87e3b76d0f0d
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex e05d13d9d1..a457725c40 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -166,9 +166,9 @@ import io.onedev.server.maintenance.RestoreDatabase;import io.onedev.server.maintenance.Upgrade;import io.onedev.server.migration.JpaConverter;import io.onedev.server.migration.PersistentBagConverter;-import io.onedev.server.model.support.AutoDiscoveredJobExecutor;-import io.onedev.server.model.support.authenticator.Authenticator;-import io.onedev.server.model.support.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.authenticator.Authenticator;+import io.onedev.server.model.support.administration.jobexecutor.AutoDiscoveredJobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.notification.CodeCommentNotificationManager;import io.onedev.server.notification.CommitNotificationManager;import io.onedev.server.notification.DefaultMailManager;diff --git a/server-core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java b/server-core/src/main/java/io/onedev/server/cache/DefaultCacheManager.javaindex a36ca4d7e7..139a906883 100644--- a/server-core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java+++ b/server-core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java@@ -22,6 +22,7 @@ import com.google.common.collect.BiMap;import com.google.common.collect.HashBiMap;import io.onedev.commons.launcher.loader.Listen;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarted;@@ -47,7 +48,6 @@ import io.onedev.server.util.facade.MembershipFacade;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserAuthorizationFacade;import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.util.inputspec.InputSpec;@Singletonpublic class DefaultCacheManager implements CacheManager {@@ -152,7 +152,7 @@ public class DefaultCacheManager implements CacheManager {query = dao.getSession().createQuery("select distinct name, type, value, id from BuildParam order by id");for (Object[] fields: (List<Object[]>)query.list()) {- if (!fields[1].equals(InputSpec.SECRET))+ if (!fields[1].equals(ParamSpec.SECRET))addBuildParam((String) fields[0], (String) fields[2]);}}@@ -261,7 +261,7 @@ public class DefaultCacheManager implements CacheManager {buildParamsLock.writeLock().lock();try {BuildParam param = (BuildParam) event.getEntity();- if (!param.getType().equals(InputSpec.SECRET))+ if (!param.getType().equals(ParamSpec.SECRET))addBuildParam(param.getName(), param.getValue());} finally {buildParamsLock.writeLock().unlock();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 6d045a233c..5414408022 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@@ -12,6 +12,7 @@ import java.util.Set;import javax.annotation.Nullable;import javax.validation.ConstraintValidatorContext;+import javax.validation.Valid;import javax.validation.ValidationException;import com.google.common.base.Charsets;@@ -37,7 +38,7 @@ public class CISpec implements Serializable, Validatable {private static final long serialVersionUID = 1L;public static final String BLOB_PATH = "onedev-ci.xml";-+private List<Job> jobs = new ArrayList<>();private transient Map<String, Job> jobMap;@@ -45,6 +46,7 @@ public class CISpec implements Serializable, Validatable {private transient List<Job> sortedJobs;@Editable+ @Validpublic List<Job> getJobs() {return jobs;}@@ -190,5 +192,5 @@ public class CISpec implements Serializable, Validatable {return null;}}-+}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.javaindex 6d32a39fcd..4d093e3acb 100644--- 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.java@@ -6,7 +6,7 @@ import java.util.stream.Collectors;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.util.OneContext;+import io.onedev.server.model.Project;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@@ -42,7 +42,7 @@ public class Authentication implements Serializable {@SuppressWarnings("unused")private static List<String> getPasswordSecretChoices() {- return OneContext.get().getProject().getSecrets().stream().map(it->it.getName()).collect(Collectors.toList());+ return Project.get().getSecrets().stream().map(it->it.getName()).collect(Collectors.toList());}}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java b/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.javaindex 87aaed3616..15e6d0c3c5 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java@@ -1,13 +1,15 @@package io.onedev.server.ci.job;import java.io.Serializable;--import javax.validation.constraints.Pattern;+import java.util.List;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.util.validation.annotation.RegEx;import io.onedev.server.util.validation.annotation.Path;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;@Editablepublic class CacheSpec implements Serializable {@@ -18,9 +20,11 @@ public class CacheSpec implements Serializable {private String path;- @Editable(order=100, description="Specify key of the cache. Caches with same key can be reused by different builds")+ @Editable(order=100, description="Specify key of the cache. Caches with same key can be reused by different builds. "+ + "<b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")@NotEmpty- @Pattern(regexp="[a-zA-Z0-9\\-_]+", message="Can only contain alphanumeric, dash and underscore")+ @RegEx(interpolative=true, value="[a-zA-Z0-9\\-_]+", message="Can only contain alphanumeric, dash and underscore")public String getKey() {return key;}@@ -28,9 +32,10 @@ public class CacheSpec implements Serializable {public void setKey(String key) {this.key = key;}-+@Editable(order=200, description="Specify path to cache. Non-absolute path is considered to be relative to job workspace. "- + "Specify \".\" (without quote) to cache workspace itself")+ + "Specify \".\" (without quote) to cache workspace itself. <b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")@Path@NotEmptypublic String getPath() {@@ -41,4 +46,9 @@ public class CacheSpec implements Serializable {this.path = path;}+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return Job.suggestVariables(matchWith);+ }+}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 92401371ce..d17194fef2 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@@ -11,7 +11,6 @@ import java.util.Iterator;import java.util.LinkedHashSet;import java.util.List;import java.util.Map;-import java.util.Map.Entry;import java.util.Optional;import java.util.Set;import java.util.UUID;@@ -28,8 +27,12 @@ import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import javax.servlet.http.HttpServletRequest;+import javax.validation.ConstraintViolation;+import javax.validation.Validator;+import org.apache.commons.lang3.SerializationUtils;import org.apache.commons.lang3.StringUtils;+import org.apache.shiro.SecurityUtils;import org.apache.shiro.authc.credential.PasswordService;import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.ObjectId;@@ -47,18 +50,19 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.MatrixRunner;import io.onedev.k8shelper.CacheInstance;+import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.InvalidCISpecException;import io.onedev.server.ci.job.log.JobLogManager;import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.ci.job.paramspec.SecretParam;import io.onedev.server.ci.job.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;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.build.BuildFinished;import io.onedev.server.event.build.BuildPending;@@ -74,7 +78,8 @@ import io.onedev.server.model.Project;import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.User;-import io.onedev.server.model.support.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;+import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;@@ -82,11 +87,13 @@ 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.CommitAware;import io.onedev.server.util.JobLogger;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.util.scriptidentity.JobIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.validation.Interpolated;+import io.onedev.server.web.editable.Path;@Singletonpublic class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizationSource {@@ -149,7 +156,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic Build submit(Project project, ObjectId commitId, String jobName,Map<String, List<String>> paramMap, @Nullable User submitter) {- Lock lock = LockUtils.getLock("job-schedule: " + project.getId() + "-" + commitId.name());+ Lock lock = LockUtils.getLock("job-manager: " + project.getId() + "-" + commitId.name());transactionManager.mustRunAfterTransaction(new Runnable() {@Override@@ -171,113 +178,119 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate Build submit(Project project, ObjectId commitId, String jobName,Map<String, List<String>> paramMap, @Nullable User submitter,Set<String> checkedJobNames) {- Build build = new Build();- build.setProject(project);- build.setCommitHash(commitId.name());- build.setJobName(jobName);- build.setSubmitDate(new Date());- build.setStatus(Build.Status.WAITING);- build.setSubmitter(submitter);- JobParam.validateParamMap(build.getJob().getParamSpecMap(), paramMap);-- if (!checkedJobNames.add(jobName)) {- String message = String.format("Circular job dependencies found (%s)", checkedJobNames);- throw new OneException(message);- }-- Map<String, List<String>> paramMapToQuery = new HashMap<>(paramMap);- for (InputSpec paramSpec: build.getJob().getParamSpecs()) {- if (paramSpec instanceof SecretInput)- paramMapToQuery.remove(paramSpec.getName());- }-- Collection<Build> builds = buildManager.query(project, commitId, jobName, paramMapToQuery);-- if (builds.isEmpty()) {- for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {- InputSpec paramSpec = Preconditions.checkNotNull(build.getJob().getParamSpecMap().get(entry.getKey()));- if (!entry.getValue().isEmpty()) {- for (String string: entry.getValue()) {+ ScriptIdentity.push(new JobIdentity(project, commitId));+ try {+ Build build = new Build();+ build.setProject(project);+ build.setCommitHash(commitId.name());+ build.setJobName(jobName);+ build.setSubmitDate(new Date());+ build.setStatus(Build.Status.WAITING);+ build.setSubmitter(submitter);++ JobParam.validateParamMap(build.getJob().getParamSpecMap(), paramMap);++ if (!checkedJobNames.add(jobName)) {+ String message = String.format("Circular job dependencies found (%s)", checkedJobNames);+ throw new OneException(message);+ }++ Map<String, List<String>> paramMapToQuery = new HashMap<>(paramMap);+ for (ParamSpec paramSpec: build.getJob().getParamSpecs()) {+ if (paramSpec instanceof SecretParam)+ paramMapToQuery.remove(paramSpec.getName());+ }++ Collection<Build> builds = buildManager.query(project, commitId, jobName, paramMapToQuery);++ if (builds.isEmpty()) {+ for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {+ ParamSpec paramSpec = Preconditions.checkNotNull(build.getJob().getParamSpecMap().get(entry.getKey()));+ if (!entry.getValue().isEmpty()) {+ for (String string: entry.getValue()) {+ BuildParam param = new BuildParam();+ param.setBuild(build);+ param.setName(entry.getKey());+ param.setType(paramSpec.getType());+ param.setValue(string);+ build.getParams().add(param);+ }+ } else {BuildParam param = new BuildParam();param.setBuild(build);param.setName(entry.getKey());param.setType(paramSpec.getType());- param.setValue(string);build.getParams().add(param);}- } else {- BuildParam param = new BuildParam();- param.setBuild(build);- param.setName(entry.getKey());- param.setType(paramSpec.getType());- build.getParams().add(param);}- }-- for (JobDependency dependency: build.getJob().getJobDependencies()) {- new MatrixRunner<List<String>>(JobParam.getParamMatrix(dependency.getJobParams())) {-- @Override- public void run(Map<String, List<String>> params) {- Build dependencyBuild = submit(project, commitId, dependency.getJobName(),- params, submitter, new LinkedHashSet<>(checkedJobNames));- BuildDependence dependence = new BuildDependence();- dependence.setDependency(dependencyBuild);- dependence.setDependent(build);- dependence.setArtifacts(dependency.getArtifacts());- build.getDependencies().add(dependence);++ for (JobDependency dependency: build.getJob().getJobDependencies()) {+ new MatrixRunner<List<String>>(JobParam.getParamMatrix(dependency.getJobParams())) {++ @Override+ public void run(Map<String, List<String>> params) {+ Build dependencyBuild = submit(project, commitId, dependency.getJobName(),+ params, submitter, new LinkedHashSet<>(checkedJobNames));+ BuildDependence dependence = new BuildDependence();+ dependence.setDependency(dependencyBuild);+ dependence.setDependent(build);+ dependence.setArtifacts(dependency.getArtifacts());+ build.getDependencies().add(dependence);+ }++ }.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);}-- }.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) {+ if (!subject.isPermitted(new ProjectPermission(dependencyProject.getFacade(),+ ProjectPrivilege.CODE_READ))) {throw new OneException("Unable to access dependency project '"- + dependency.getProjectName() + "': user not found");+ + dependency.getProjectName() + "': permission denied");}- 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");++ Build dependencyBuild = buildManager.find(dependencyProject, Long.parseLong(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);}- 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);}- 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));+ return build;+ } else {+ return builds.iterator().next();}-- buildManager.create(build);- listenerRegistry.post(new BuildSubmitted(build));- return build;- } else {- return builds.iterator().next();+ } finally {+ ScriptIdentity.pop();}}@@ -291,10 +304,26 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}private void execute(Build build) {+ ScriptIdentity.push(new JobIdentity(build.getProject(), build.getCommitId()));try {String jobToken = UUID.randomUUID().toString();Collection<String> jobSecretsToMask = Sets.newHashSet(jobToken);- Job job = build.getJob();++ Job job = SerializationUtils.clone(build.getJob());+ build.interpolate(job);++ // make sure interpolated result passes validation+ Interpolated.push(true);+ try {+ for (ConstraintViolation<?> violation: OneDev.getInstance(Validator.class).validate(this)) {+ String errorMessage = String.format("Error validating job (property: %s, message: %s)",+ new Path(violation.getPropertyPath()).toString(), violation.getMessage());+ throw new OneException(errorMessage);+ }+ } finally {+ Interpolated.pop();+ }+ObjectId commitId = ObjectId.fromString(build.getCommitHash());JobExecutor executor = getJobExecutor(build.getProject(), commitId, job.getName(), job.getImage());if (executor != null) {@@ -304,6 +333,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizLong buildNumber = build.getNumber();String projectName = build.getProject().getName();File projectGitDir = build.getProject().getGitDir();+JobExecution execution = new JobExecution(executorService.submit(new Runnable() {@Override@@ -311,9 +341,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizjobLogger.log("Creating server workspace...");File serverWorkspace = FileUtils.createTempDir("server-workspace");try {- Map<String, String> envVars = new HashMap<>();Set<String> includeFiles = new HashSet<>();Set<String> excludeFiles = new HashSet<>();+ List<SubmoduleCredential> submoduleCredentials = new ArrayList<>();sessionManager.run(new Runnable() {@@ -327,30 +357,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizdependence.getArtifacts(), serverWorkspace);}}- envVars.put("ONEDEV_PROJECT", build.getProject().getName());- envVars.put("ONEDEV_COMMIT", commitId.name());- envVars.put("ONEDEV_JOB", job.getName());- envVars.put("ONEDEV_BUILD_NUMBER", String.valueOf(build.getNumber()));- for (Entry<String, Input> entry: build.getParamInputs().entrySet()) {- String paramName = entry.getKey();- if (build.isParamVisible(paramName)) {- String paramType = entry.getValue().getType();- List<String> paramValues = entry.getValue().getValues();- if (paramValues.size() > 1) {- int index = 1;- for (String value: paramValues) {- if (paramType.equals(InputSpec.SECRET))- value = build.getSecretValue(value);- envVars.put("BUILD_PARAM_" + paramName.toUpperCase() + "_" + index++, value);- }- } else if (paramValues.size() == 1) {- String value = paramValues.iterator().next();- if (paramType.equals(InputSpec.SECRET))- value = build.getSecretValue(value);- envVars.put("BUILD_PARAM_" + paramName.toUpperCase(), value);- }- }- }if (job.getArtifacts() != null) {PatternSet patternSet = PatternSet.fromString(job.getArtifacts());@@ -362,24 +368,27 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizincludeFiles.addAll(patternSet.getIncludes());excludeFiles.addAll(patternSet.getExcludes());}++ if (job.isRetrieveSource()) {+ for (SubmoduleCredential submoduleCredential: job.getSubmoduleCredentials()) {+ SubmoduleCredential resolvedSubmoduleCredential = new SubmoduleCredential();+ resolvedSubmoduleCredential.setUrl(submoduleCredential.getUrl());+ resolvedSubmoduleCredential.setUserName(submoduleCredential.getUserName());+ resolvedSubmoduleCredential.setPasswordSecret(+ build.getSecretValue(submoduleCredential.getPasswordSecret()));+ submoduleCredentials.add(resolvedSubmoduleCredential);+ }+ }+}});- List<SubmoduleCredential> submoduleCredentials = new ArrayList<>();- if (job.isRetrieveSource()) {- for (SubmoduleCredential submoduleCredential: job.getSubmoduleCredentials()) {- SubmoduleCredential resolvedSubmoduleCredential = new SubmoduleCredential();- resolvedSubmoduleCredential.setUrl(submoduleCredential.getUrl());- resolvedSubmoduleCredential.setUserName(submoduleCredential.getUserName());- resolvedSubmoduleCredential.setPasswordSecret(build.getSecretValue(submoduleCredential.getPasswordSecret()));- submoduleCredentials.add(resolvedSubmoduleCredential);- }- }- JobContext jobContext = new JobContext(projectName, buildNumber, projectGitDir, job.getImage(), serverWorkspace,- envVars, job.getCommands(), job.isRetrieveSource(), submoduleCredentials, job.getCpuRequirement(),- job.getMemoryRequirement(), commitId, job.getCaches(), new PatternSet(includeFiles, excludeFiles),- executor.getCacheTTL(), job.getServices(), jobLogger) {+ JobContext jobContext = new JobContext(projectName, buildNumber, projectGitDir, job.getImage(),+ serverWorkspace, job.getCommands(), job.isRetrieveSource(), submoduleCredentials,+ job.getCpuRequirement(), job.getMemoryRequirement(), commitId, job.getCaches(),+ new PatternSet(includeFiles, excludeFiles), executor.getCacheTTL(), job.getServices(),+ jobLogger) {@Overridepublic void notifyJobRunning() {@@ -439,8 +448,13 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz} else {markBuildError(build, "No applicable job executor");}- } catch (InvalidCISpecException e) {- markBuildError(build, e.getMessage());+ } catch (Exception e) {+ if (e.getMessage() != null)+ markBuildError(build, e.getMessage());+ else+ markBuildError(build, Throwables.getStackTraceAsString(e));+ } finally {+ ScriptIdentity.pop();}}@@ -478,23 +492,42 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Sessional@Listenpublic void on(ProjectEvent event) {- if (event instanceof BuildCommitAware) {- ObjectId commitId = ((BuildCommitAware) event).getBuildCommit();+ if (event instanceof CommitAware) {+ ObjectId commitId = ((CommitAware) event).getCommitId();if (!commitId.equals(ObjectId.zeroId())) {+ ScriptIdentity.push(new JobIdentity(event.getProject(), commitId));try {CISpec ciSpec = event.getProject().getCISpec(commitId);if (ciSpec != null) {for (Job job: ciSpec.getJobs()) {JobTrigger trigger = job.getMatchedTrigger(event);if (trigger != null) {- new MatrixRunner<List<String>>(JobParam.getParamMatrix(trigger.getParams())) {-+ Map<String, List<List<String>>> paramMatrix = JobParam.getParamMatrix(trigger.getParams());+ Long projectId = event.getProject().getId();++ // run asynchrously as session may get closed due to exception+ sessionManager.runAsync(new Runnable() {+@Override- public void run(Map<String, List<String>> paramMap) {- submit(event.getProject(), commitId, job.getName(), paramMap, null);+ public void run() {+ Project project = projectManager.load(projectId);+ try {+ new MatrixRunner<List<String>>(paramMatrix) {++ @Override+ public void run(Map<String, List<String>> paramMap) {+ submit(project, commitId, job.getName(), paramMap, null);+ }++ }.run();+ } catch (Exception e) {+ String message = String.format("Error submitting build (project: %s, commit: %s, job: %s)",+ project.getName(), commitId.name(), job.getName());+ logger.error(message, e);+ }}- }.run();+ }, SecurityUtils.getSubject());}}}@@ -502,6 +535,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizString message = String.format("Error checking job triggers (project: %s, commit: %s)",event.getProject().getName(), commitId.name());logger.error(message, e);+ } finally {+ ScriptIdentity.pop();}}}@@ -519,7 +554,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizbuild.setSubmitter(submitter);buildParamManager.deleteParams(build);for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {- InputSpec paramSpec = build.getJob().getParamSpecMap().get(entry.getKey());+ ParamSpec paramSpec = build.getJob().getParamSpecMap().get(entry.getKey());Preconditions.checkNotNull(paramSpec);String type = paramSpec.getType();List<String> values = entry.getValue();@@ -687,7 +722,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Listenpublic void on(BuildFinished event) {for (BuildParam param: event.getBuild().getParams()) {- if (param.getType().equals(InputSpec.SECRET))+ if (param.getType().equals(ParamSpec.SECRET))param.setValue(null);}}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.java b/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.javanew file mode 100644index 0000000000..b0704ea208--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.java@@ -0,0 +1,52 @@+package io.onedev.server.ci.job;++import java.io.Serializable;+import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.util.validation.annotation.VariableName;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;++@Editable+public class EnvVar implements Serializable {++ private static final long serialVersionUID = 1L;++ private String name;++ private String value;++ @Editable(order=100, description="Specify name of the environment variable. "+ + "<b>Note:</b> Type '@' to start inserting job variable")+ @Interpolative(variableSuggester="suggestVariables")+ @VariableName+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=200, description="Specify value of the environment variable. "+ + "<b>Note:</b> Type '@' to start inserting job variable")+ @Interpolative(variableSuggester="suggestVariables")+ @NotEmpty+ public String getValue() {+ return value;+ }++ public void setValue(String value) {+ this.value = value;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return Job.suggestVariables(matchWith);+ }++}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 ba6c9f8a9d..e524e9e5c9 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@@ -15,24 +15,34 @@ import java.util.Map;import java.util.Set;import javax.validation.ConstraintValidatorContext;+import javax.validation.Valid;import javax.validation.constraints.Size;+import org.apache.wicket.Component;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.event.ProjectEvent;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.model.Project;+import io.onedev.server.util.ComponentContext;+import io.onedev.server.util.EditContext;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;+import io.onedev.server.util.validation.annotation.GroupName;+import io.onedev.server.web.editable.annotation.Code;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;+import io.onedev.server.web.editable.annotation.Interpolative;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;-import io.onedev.server.web.editable.annotation.Script;import io.onedev.server.web.editable.annotation.ShowCondition;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.util.SuggestionUtils;+import io.onedev.server.web.util.WicketUtils;@Editable@Horizontal@@ -45,7 +55,7 @@ public class Job implements Serializable, Validatable {private String name;- private List<InputSpec> paramSpecs = new ArrayList<>();+ private List<ParamSpec> paramSpecs = new ArrayList<>();private String image;@@ -75,9 +85,10 @@ public class Job implements Serializable, Validatable {private long timeout = 3600;- private transient Map<String, InputSpec> paramSpecMap;+ private transient Map<String, ParamSpec> paramSpecMap;@Editable(order=100, description="Specify name of the job")+ @GroupName@NotEmptypublic String getName() {return name;@@ -87,7 +98,8 @@ public class Job implements Serializable, Validatable {this.name = name;}- @Editable(order=110, description="Specify docker image of the job")+ @Editable(order=110, description="Specify docker image of the job. <b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getImage() {return image;@@ -97,10 +109,24 @@ public class Job implements Serializable, Validatable {this.image = image;}+ public static List<InputSuggestion> suggestVariables(String matchWith) {+ Component component = ComponentContext.get().getComponent();+ List<InputSuggestion> suggestions = new ArrayList<>();+ ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();+ JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);+ if (jobAware != null) {+ Job job = jobAware.getJob();+ if (job != null)+ suggestions.addAll(SuggestionUtils.suggestVariables(page.getProject(), page.getCommit(), job, matchWith));+ }+ return suggestions;+ }+@Editable(order=120, description="Specify commands to execute in above image, with one command per line. "+ "For Windows based images, commands will be interpretated by cmd.exe, and for Unix/Linux "- + "based images, commands will be interpretated by shell")- @Script(Script.SHELL)+ + "based images, commands will be interpretated by shell. <b>Note:</b> Input '@' to start inserting variable")+ @Interpolative+ @Code(language = Code.SHELL, variableProvider="getVariables")@Size(min=1, message="may not be empty")public List<String> getCommands() {return commands;@@ -110,16 +136,30 @@ public class Job implements Serializable, Validatable {this.commands = commands;}+ @SuppressWarnings("unused")+ private static List<String> getVariables() {+ List<String> variables = new ArrayList<>();+ ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();+ Project project = page.getProject();+ ObjectId commitId = page.getCommit();+ Job job = ComponentContext.get().getComponent().findParent(JobAware.class).getJob();+ for (InputSuggestion suggestion: SuggestionUtils.suggestVariables(project, commitId, job, ""))+ variables.add(suggestion.getContent());+ return variables;+ }+@Editable(order=130, name="Parameter Specs", description="Define parameter specifications of the job")- public List<InputSpec> getParamSpecs() {+ @Valid+ public List<ParamSpec> getParamSpecs() {return paramSpecs;}- public void setParamSpecs(List<InputSpec> paramSpecs) {+ public void setParamSpecs(List<ParamSpec> paramSpecs) {this.paramSpecs = paramSpecs;}@Editable(order=500, description="Use triggers to run the job automatically under certain conditions")+ @Validpublic List<JobTrigger> getTriggers() {return triggers;}@@ -140,6 +180,7 @@ public class Job implements Serializable, Validatable {@Editable(order=9100, group="Source Retrieval", description="For git submodules accessing via http/https, you will "+ "need to specify credentials here if required")@ShowCondition("isSubmoduleCredentialsVisible")+ @Validpublic List<SubmoduleCredential> getSubmoduleCredentials() {return submoduleCredentials;}@@ -150,11 +191,12 @@ public class Job implements Serializable, Validatable {@SuppressWarnings("unused")private static boolean isSubmoduleCredentialsVisible() {- return (boolean) OneContext.get().getEditContext().getInputValue("retrieveSource");+ return (boolean) EditContext.get().getInputValue("retrieveSource");}@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")+ @Validpublic List<JobDependency> getJobDependencies() {return jobDependencies;}@@ -165,6 +207,7 @@ public class Job implements Serializable, Validatable {@Editable(name="Project Dependencies", order=9113, group="Dependencies", description="Use project dependency to retrieve "+ "artifacts from other projects")+ @Validpublic List<ProjectDependency> getProjectDependencies() {return projectDependencies;}@@ -174,7 +217,9 @@ public class Job implements Serializable, Validatable {}@Editable(order=9115, group="Artifacts & Reports", description="Optionally specify files to publish as job artifacts. "- + "Artifact files are relative to OneDev workspace, and may use * or ? for pattern match")+ + "Artifact files are relative to OneDev workspace, and may use * or ? for pattern match. Variable can be "+ + "inserted by typing '@'")+ @Interpolative(variableSuggester="suggestVariables")@Patterns@NameOfEmptyValue("No artifacts")public String getArtifacts() {@@ -186,6 +231,7 @@ public class Job implements Serializable, Validatable {}@Editable(order=9120, group="Artifacts & Reports", description="Add job reports here")+ @Validpublic List<JobReport> getReports() {return reports;}@@ -195,7 +241,9 @@ public class Job implements Serializable, Validatable {}@Editable(order=9200, name="CPU Requirement", group="Resource Requirements", description="Specify CPU requirement of the job. "- + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details")+ + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details. "+ + "<b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getCpuRequirement() {return cpuRequirement;@@ -206,7 +254,9 @@ public class Job implements Serializable, Validatable {}@Editable(order=9300, group="Resource Requirements", description="Specify memory requirement of the job. "- + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details")+ + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details. "+ + "<b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getMemoryRequirement() {return memoryRequirement;@@ -217,6 +267,7 @@ public class Job implements Serializable, Validatable {}@Editable(order=10000, group="More Settings", description="Optionally define services used by this job")+ @Validpublic List<JobService> getServices() {return services;}@@ -229,6 +280,7 @@ public class Job implements Serializable, Validatable {+ "projects, you may cache the <tt>node_modules</tt> folder to avoid downloading node modules for "+ "subsequent job executions. Note that cache is considered as a best-effort approach and your "+ "build script should always consider that cache might not be available")+ @Validpublic List<CacheSpec> getCaches() {return caches;}@@ -289,7 +341,7 @@ public class Job implements Serializable, Validatable {}Set<String> paramSpecNames = new HashSet<>();- for (InputSpec paramSpec: paramSpecs) {+ for (ParamSpec paramSpec: paramSpecs) {if (paramSpecNames.contains(paramSpec.getName())) {isValid = false;context.buildConstraintViolationWithTemplate("Duplicate parameter spec: " + paramSpec.getName())@@ -320,8 +372,8 @@ public class Job implements Serializable, Validatable {return isValid;}-- public Map<String, InputSpec> getParamSpecMap() {++ public Map<String, ParamSpec> getParamSpecMap() {if (paramSpecMap == null)paramSpecMap = JobParam.getParamSpecMap(paramSpecs);return paramSpecMap;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java b/server-core/src/main/java/io/onedev/server/ci/job/JobContext.javaindex 032bf764c6..8763223dc3 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java@@ -24,8 +24,6 @@ public abstract class JobContext {private final File serverWorkspace;- private final Map<String, String> envVars;-private final List<String> commands;private final boolean retrieveSource;@@ -53,17 +51,15 @@ public abstract class JobContext {private final Map<String, Integer> cacheCounts = new ConcurrentHashMap<>();public JobContext(String projectName, Long buildNumber, File projectGitDir, String image,- File workspace, Map<String, String> envVars, List<String> commands, boolean retrieveSource,- List<SubmoduleCredential> submoduleCredentials,- String cpuRequirement, String memoryRequirement, ObjectId commitId,- Collection<CacheSpec> caches, PatternSet collectFiles, int cacheTTL,- List<JobService> services, JobLogger logger) {+ File workspace, List<String> commands, boolean retrieveSource,+ List<SubmoduleCredential> submoduleCredentials, String cpuRequirement,+ String memoryRequirement, ObjectId commitId, Collection<CacheSpec> caches,+ PatternSet collectFiles, int cacheTTL, List<JobService> services, JobLogger logger) {this.projectName = projectName;this.buildNumber = buildNumber;this.projectGitDir = projectGitDir;this.image = image;this.serverWorkspace = workspace;- this.envVars = envVars;this.commands = commands;this.retrieveSource = retrieveSource;this.submoduleCredentials = submoduleCredentials;@@ -97,10 +93,6 @@ public abstract class JobContext {return serverWorkspace;}- public Map<String, String> getEnvVars() {- return envVars;- }-public List<String> getCommands() {return commands;}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.javaindex 011dd96b09..ab1808e364 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java@@ -7,13 +7,16 @@ import java.util.List;import org.apache.wicket.Component;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.CISpecAware;import io.onedev.server.ci.job.param.JobParam;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.util.ComponentContext;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.ParamSpecProvider;@@ -31,6 +34,7 @@ public class JobDependency implements Serializable {private String artifacts = "**";+ // change Named("jobName") also if change name of this property@Editable(order=100, name="Job")@ChoiceProvider("getJobChoices")@NotEmpty@@ -54,7 +58,9 @@ public class JobDependency implements Serializable {}@Editable(order=300, name="Artifacts to Retrieve", description="Optionally specify artifacts to retrieve "- + "from the dependency into job workspace. Leave empty to do not retrieve any artifacts")+ + "from the dependency into job workspace. Leave empty to do not retrieve any artifacts. "+ + "<b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")@Patterns@NameOfEmptyValue("Do not retrieve")public String getArtifacts() {@@ -65,10 +71,15 @@ public class JobDependency implements Serializable {this.artifacts = artifacts;}+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return Job.suggestVariables(matchWith);+ }+@SuppressWarnings("unused")private static List<String> getJobChoices() {List<String> choices = new ArrayList<>();- Component component = OneContext.get().getComponent();+ Component component = ComponentContext.get().getComponent();CISpecAware ciSpecAware = WicketUtils.findInnermost(component, CISpecAware.class);if (ciSpecAware != null) {CISpec ciSpec = ciSpecAware.getCISpec();@@ -89,10 +100,10 @@ public class JobDependency implements Serializable {}@SuppressWarnings("unused")- private static List<InputSpec> getParamSpecs() {- String jobName = (String) OneContext.get().getEditContext().getInputValue("jobName");+ private static List<ParamSpec> getParamSpecs() {+ String jobName = (String) EditContext.get().getInputValue("jobName");if (jobName != null) {- Component component = OneContext.get().getComponent();+ Component component = ComponentContext.get().getComponent();CISpecAware ciSpecAware = WicketUtils.findInnermost(component, CISpecAware.class);if (ciSpecAware != null) {CISpec ciSpec = ciSpecAware.getCISpec();diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobExecutorDiscoverer.java b/server-core/src/main/java/io/onedev/server/ci/job/JobExecutorDiscoverer.javaindex 63a79dbbb2..fa7e4ebcea 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/JobExecutorDiscoverer.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobExecutorDiscoverer.java@@ -2,7 +2,7 @@ package io.onedev.server.ci.job;import javax.annotation.Nullable;-import io.onedev.server.model.support.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;public interface JobExecutorDiscoverer {diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobReport.java b/server-core/src/main/java/io/onedev/server/ci/job/JobReport.javaindex d319b416ac..cd641ec93c 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/JobReport.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobReport.java@@ -2,13 +2,16 @@ package io.onedev.server.ci.job;import java.io.File;import java.io.Serializable;+import java.util.List;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Build;import io.onedev.server.util.JobLogger;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;import io.onedev.server.web.editable.annotation.Patterns;@Editable@@ -20,7 +23,9 @@ public abstract class JobReport implements Serializable {private transient PatternSet patternSet;- @Editable(order=100, description="Specify files relative to OneDev workspace. Use * or ? for pattern match")+ @Editable(order=100, description="Specify files relative to OneDev workspace. Use * or ? for pattern match. "+ + "<b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")@Patterns@NotEmptypublic String getFilePatterns() {@@ -30,6 +35,11 @@ public abstract class JobReport implements Serializable {public void setFilePatterns(String filePatterns) {this.filePatterns = filePatterns;}++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return Job.suggestVariables(matchWith);+ }public PatternSet getPatternSet() {if (patternSet == null)diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobService.java b/server-core/src/main/java/io/onedev/server/ci/job/JobService.javaindex 24a3d0a5d4..ed644daadb 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/JobService.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobService.java@@ -6,8 +6,10 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.util.validation.annotation.VariableName;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;@Editablepublic class JobService implements Serializable {@@ -20,7 +22,7 @@ public class JobService implements Serializable {private String arguments;- private List<Variable> envVars = new ArrayList<>();+ private List<EnvVar> envVars = new ArrayList<>();private String readinessCheckCommand;@@ -29,7 +31,8 @@ public class JobService implements Serializable {private String memoryRequirement = "128m";@Editable(order=100, description="Specify name of the service, which can be used to access "- + "the service")+ + "the service. <b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")@VariableName@NotEmptypublic String getName() {@@ -40,7 +43,9 @@ public class JobService implements Serializable {this.name = name;}- @Editable(order=200, description="Specify docker image of the service")+ @Editable(order=200, description="Specify docker image of the service. Type '@' to start "+ + "inserting variable")+ @Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getImage() {return image;@@ -50,7 +55,9 @@ public class JobService implements Serializable {this.image = image;}- @Editable(order=220, description="Optionally specify arguments to run above image")+ @Editable(order=220, description="Optionally specify arguments to run above image. "+ + "<b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")public String getArguments() {return arguments;}@@ -61,17 +68,18 @@ public class JobService implements Serializable {@Editable(order=300, name="Environment Variables", description="Optionally specify environment variables of "+ "the service")- public List<Variable> getEnvVars() {+ public List<EnvVar> getEnvVars() {return envVars;}- public void setEnvVars(List<Variable> envVars) {+ public void setEnvVars(List<EnvVar> envVars) {this.envVars = envVars;}@Editable(order=400, description="Specify command to check readiness of the service. This command will "+ "be interpretated by cmd.exe on Windows images, and by shell on Linux images. It will be "- + "executed repeatedly until a zero code is returned, which means that service is ready")+ + "executed repeatedly until a zero code is returned to indicate service ready. Variable can "+ + "be inserted to this field by typing '@'")@NotEmptypublic String getReadinessCheckCommand() {return readinessCheckCommand;@@ -103,4 +111,9 @@ public class JobService implements Serializable {this.memoryRequirement = memoryRequirement;}+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return Job.suggestVariables(matchWith);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobVariable.java b/server-core/src/main/java/io/onedev/server/ci/job/JobVariable.javanew file mode 100644index 0000000000..06918f56b4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobVariable.java@@ -0,0 +1,64 @@+package io.onedev.server.ci.job;++import java.util.stream.Collectors;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.model.Build;++public enum JobVariable {++ PROJECT_NAME {++ @Override+ public String getValue(Build build) {+ return build.getProject().getName();+ }++ },+ JOB_NAME {++ @Override+ public String getValue(Build build) {+ return build.getJobName();+ }++ },+ COMMIT_HASH {++ @Override+ public String getValue(Build build) {+ return build.getCommitHash();+ }++ },+ BUILD_NUMBER {++ @Override+ public String getValue(Build build) {+ return String.valueOf(build.getNumber());+ }++ },+ ON_BRANCHES {++ @Override+ public String getValue(Build build) {+ return StringUtils.join(build.getOnBranches(), " ");+ }++ },+ PULL_REQUEST_IDS {++ @Override+ public String getValue(Build build) {+ return build.getPullRequestBuilds()+ .stream()+ .map(it->it.getRequest().getId().toString())+ .collect(Collectors.joining(" "));+ }++ };++ public abstract String getValue(Build build);++}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.javaindex bc0aea9c7d..e2027db57d 100644--- 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.java@@ -5,7 +5,6 @@ import java.util.ArrayList;import java.util.List;import javax.annotation.Nullable;-import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;@@ -16,11 +15,11 @@ 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.EditContext;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.Interpolative;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.util.SuggestionUtils;@@ -35,10 +34,11 @@ public class ProjectDependency implements Serializable {private String projectName;- private Long buildNumber;+ private String buildNumber;private String artifacts = "**";+ // change Named("projectName") also if change name of this property@Editable(order=200, name="Project", description="Specify project to retrieve artifacts from")@ChoiceProvider("getProjectChoices")@NotEmpty@@ -64,31 +64,42 @@ public class ProjectDependency implements Serializable {return choices;}- @Editable(order=300, name="Build", description="Specify build to retrieve artifacts from")- @BuildChoice("getEditingProject")- @NotNull- public Long getBuildNumber() {+ @Editable(order=300, name="Build", description="Specify build to retrieve artifacts from. "+ + "<b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables", literalSuggester="suggestBuilds")+ @NotEmpty+ public String getBuildNumber() {return buildNumber;}- public void setBuildNumber(Long buildNumber) {+ public void setBuildNumber(String buildNumber) {this.buildNumber = buildNumber;}-+@Nullable- private static Project getEditingProject() {- String projectName = (String) OneContext.get().getEditContext().getInputValue("projectName");+ private static Project getInputProject() {+ String projectName = (String) EditContext.get().getInputValue("projectName");if (projectName != null) {Project project = OneDev.getInstance(ProjectManager.class).find(projectName);- if (SecurityUtils.canReadCode(project.getFacade()))+ if (project != null && SecurityUtils.canReadCode(project.getFacade()))return project;}return null;}++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestBuilds(String matchWith) {+ Project project = getInputProject();+ if (project != null)+ return SuggestionUtils.suggestBuilds(project, matchWith);+ else+ return new ArrayList<>();+ }@Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve "- + "into job workspace")- @Patterns("getArtifactSuggestions")+ + "into job workspace. <b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")+ @Patterns(suggester="suggestArtifacts")@NotEmptypublic String getArtifacts() {return artifacts;@@ -99,11 +110,16 @@ public class ProjectDependency implements Serializable {}@SuppressWarnings("unused")- private static List<InputSuggestion> getArtifactSuggestions(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);+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return Job.suggestVariables(matchWith);+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestArtifacts(String matchWith) {+ Project project = getInputProject();+ String buildNumber = (String) EditContext.get().getInputValue("buildNumber");+ if (project != null && io.onedev.server.util.interpolative.Interpolative.fromString(buildNumber).getSegments().isEmpty()) {+ Build build = OneDev.getInstance(BuildManager.class).find(project, Long.parseLong(buildNumber));if (build != null)return SuggestionUtils.suggestArtifacts(build, matchWith);}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 cfaee07da8..9803826873 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,8 +1,12 @@package io.onedev.server.ci.job;+import java.util.List;+import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;@Editablepublic class SubmoduleCredential extends Authentication {@@ -11,7 +15,8 @@ public class SubmoduleCredential extends Authentication {private String url;- @Editable(order=100)+ @Editable(order=100, description="Specify submodule url. <b>Note:</b> Input '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getUrl() {return url;@@ -21,4 +26,9 @@ public class SubmoduleCredential extends Authentication {this.url = url;}+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return Job.suggestVariables(matchWith);+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/ci/job/Variable.java b/server-core/src/main/java/io/onedev/server/ci/job/Variable.javadeleted file mode 100644index 8b496852f6..0000000000--- a/server-core/src/main/java/io/onedev/server/ci/job/Variable.java+++ /dev/null@@ -1,40 +0,0 @@-package io.onedev.server.ci.job;--import java.io.Serializable;--import org.hibernate.validator.constraints.NotEmpty;--import io.onedev.server.util.validation.annotation.VariableName;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class Variable implements Serializable {-- private static final long serialVersionUID = 1L;-- private String name;-- private String value;-- @Editable(order=100)- @VariableName- @NotEmpty- public String getName() {- return name;- }-- public void setName(String name) {- this.name = name;- }-- @Editable(order=200)- @NotEmpty- public String getValue() {- return value;- }-- public void setValue(String value) {- this.value = value;- }--}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.javanew file mode 100644index 0000000000..a71d3964a7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.java@@ -0,0 +1,69 @@+package io.onedev.server.ci.job;++import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.Map.Entry;+import java.util.function.Function;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneException;+import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.model.Build;+import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.Input;++public class VariableInterpolator implements Function<String, String> {++ public static final String PARAMS_PREFIX = "params.";++ public static final String SECRETS_PREFIX = "secrets.";++ public static final String SCRIPTS_PREFIX = "scripts.";++ private final Build build;++ public VariableInterpolator(Build build) {+ this.build = build;+ }++ @Override+ public String apply(String t) {+ for (JobVariable var: JobVariable.values()) {+ if (var.name().toLowerCase().equals(t))+ return var.getValue(build);+ }+ if (t.startsWith(PARAMS_PREFIX)) {+ String paramName = t.substring(PARAMS_PREFIX.length());+ for (Entry<String, Input> entry: build.getParamInputs().entrySet()) {+ if (paramName.equals(entry.getKey())) {+ if (build.isParamVisible(paramName)) {+ String paramType = entry.getValue().getType();+ List<String> paramValues = new ArrayList<>();+ for (String value: entry.getValue().getValues()) {+ if (paramType.equals(ParamSpec.SECRET))+ value = build.getSecretValue(value);+ paramValues.add(value);+ }+ return StringUtils.join(paramValues, "\n");+ } else {+ throw new OneException("Invisible param: " + paramName);+ }+ }+ }+ throw new OneException("Undefined param: " + paramName);+ } else if (t.startsWith(SECRETS_PREFIX)) {+ String secretName = t.substring(SECRETS_PREFIX.length());+ return build.getSecretValue(secretName);+ } else if (t.startsWith(SCRIPTS_PREFIX)) {+ String scriptName = t.substring(SCRIPTS_PREFIX.length());+ Map<String, Object> context = new HashMap<>();+ context.put("build", build);+ return (String) GroovyUtils.evalScriptByName(scriptName, context);+ } else {+ throw new OneException("Unrecognized interpolation variable: " + t);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.java b/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.javaindex 2e529aba69..608e0405df 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.java@@ -45,10 +45,10 @@ import io.onedev.server.ci.job.log.instruction.LogInstructionParser.ParamContextimport io.onedev.server.entitymanager.BuildManager;import io.onedev.server.event.build.BuildFinished;import io.onedev.server.model.Build;+import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.JobLogger;-import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.web.websocket.WebSocketManager;@Singletondiff --git a/server-core/src/main/java/io/onedev/server/ci/job/param/JobParam.java b/server-core/src/main/java/io/onedev/server/ci/job/param/JobParam.javaindex ca38eb2a4c..72ab009f3e 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/param/JobParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/param/JobParam.java@@ -11,6 +11,7 @@ import java.util.Map;import java.util.Set;import javax.annotation.Nullable;+import javax.validation.Valid;import javax.validation.ValidationException;import javax.validation.constraints.NotNull;@@ -24,11 +25,14 @@ import org.hibernate.validator.constraints.NotEmpty;import com.google.common.base.Preconditions;import io.onedev.server.ci.job.Job;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.ci.job.paramspec.SecretParam;+import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.annotation.Editable;+@Editablepublic class JobParam implements Serializable {private static final long serialVersionUID = 1L;@@ -51,6 +55,7 @@ public class JobParam implements Serializable {}@NotNull+ @Validpublic ValuesProvider getValuesProvider() {return valuesProvider;}@@ -100,10 +105,10 @@ public class JobParam implements Serializable {}}- public static void validateParamMatrix(Map<String, InputSpec> paramSpecMap, Map<String, List<List<String>>> paramMatrix) {+ public static void validateParamMatrix(Map<String, ParamSpec> paramSpecMap, Map<String, List<List<String>>> paramMatrix) {validateParamNames(paramSpecMap.keySet(), paramMatrix.keySet());for (Map.Entry<String, List<List<String>>> entry: paramMatrix.entrySet()) {- InputSpec paramSpec = Preconditions.checkNotNull(paramSpecMap.get(entry.getKey()));+ ParamSpec paramSpec = Preconditions.checkNotNull(paramSpecMap.get(entry.getKey()));if (entry.getValue() != null) {try {validateParamValues(entry.getValue());@@ -118,12 +123,12 @@ public class JobParam implements Serializable {}}- private static void validateParamValue(InputSpec paramSpec, String paramName, List<String> paramValue) {+ private static void validateParamValue(ParamSpec paramSpec, String paramName, List<String> paramValue) {try {paramSpec.convertToObject(paramValue);} catch (Exception e) {String displayValue;- if (paramSpec instanceof SecretInput)+ if (paramSpec instanceof SecretParam)displayValue = SecretInput.MASK;elsedisplayValue = paramValue.toString();@@ -143,22 +148,22 @@ public class JobParam implements Serializable {}}- public static void validateParamMap(Map<String, InputSpec> paramSpecMap, Map<String, List<String>> paramMap) {+ public static void validateParamMap(Map<String, ParamSpec> paramSpecMap, Map<String, List<String>> paramMap) {validateParamNames(paramSpecMap.keySet(), paramMap.keySet());for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {- InputSpec paramSpec = Preconditions.checkNotNull(paramSpecMap.get(entry.getKey()));+ ParamSpec paramSpec = Preconditions.checkNotNull(paramSpecMap.get(entry.getKey()));validateParamValue(paramSpec, entry.getKey(), entry.getValue());}}- public static Map<String, InputSpec> getParamSpecMap(List<InputSpec> paramSpecs) {- Map<String, InputSpec> paramSpecMap = new LinkedHashMap<>();- for (InputSpec paramSpec: paramSpecs)+ public static Map<String, ParamSpec> getParamSpecMap(List<ParamSpec> paramSpecs) {+ Map<String, ParamSpec> paramSpecMap = new LinkedHashMap<>();+ for (ParamSpec paramSpec: paramSpecs)paramSpecMap.put(paramSpec.getName(), paramSpec);return paramSpecMap;}- public static void validateParams(List<InputSpec> paramSpecs, List<JobParam> params) {+ public static void validateParams(List<ParamSpec> paramSpecs, List<JobParam> params) {Map<String, List<List<String>>> paramMap = new HashMap<>();for (JobParam param: params) {List<List<String>> values;@@ -173,15 +178,15 @@ public class JobParam implements Serializable {}@SuppressWarnings("unchecked")- public static Class<? extends Serializable> defineBeanClass(Collection<InputSpec> paramSpecs) {+ public static Class<? extends Serializable> defineBeanClass(Collection<ParamSpec> paramSpecs) {byte[] bytes = SerializationUtils.serialize((Serializable) paramSpecs);String className = PARAM_BEAN_PREFIX + "_" + Hex.encodeHexString(bytes);- List<InputSpec> paramSpecsCopy = new ArrayList<>(paramSpecs);+ List<ParamSpec> paramSpecsCopy = new ArrayList<>(paramSpecs);for (int i=0; i<paramSpecsCopy.size(); i++) {- InputSpec paramSpec = paramSpecsCopy.get(i);- if (paramSpec instanceof SecretInput) {- InputSpec paramSpecClone = (InputSpec) SerializationUtils.clone(paramSpec);+ ParamSpec paramSpec = paramSpecsCopy.get(i);+ if (paramSpec instanceof SecretParam) {+ ParamSpec paramSpecClone = (ParamSpec) SerializationUtils.clone(paramSpec);String description = paramSpecClone.getDescription();if (description == null)description = "";@@ -191,7 +196,7 @@ public class JobParam implements Serializable {paramSpecsCopy.set(i, paramSpecClone);}}- return (Class<? extends Serializable>) InputSpec.defineClass(className, "Build Parameters", paramSpecsCopy);+ return (Class<? extends Serializable>) ParamSpec.defineClass(className, "Build Parameters", paramSpecsCopy);}@SuppressWarnings("unchecked")@@ -204,7 +209,7 @@ public class JobParam implements Serializable {} catch (DecoderException e) {throw new RuntimeException(e);}- List<InputSpec> paramSpecs = (List<InputSpec>) SerializationUtils.deserialize(bytes);+ List<ParamSpec> paramSpecs = (List<ParamSpec>) SerializationUtils.deserialize(bytes);return defineBeanClass(paramSpecs);} else {return null;@@ -218,11 +223,11 @@ public class JobParam implements Serializable {for (PropertyDescriptor property: groupProperties) {if (paramNames.contains(property.getDisplayName())) {Object typedValue = property.getPropertyValue(paramBean);- InputSpec paramSpec = Preconditions.checkNotNull(job.getParamSpecMap().get(property.getDisplayName()));+ ParamSpec paramSpec = Preconditions.checkNotNull(job.getParamSpecMap().get(property.getDisplayName()));List<String> values = new ArrayList<>();for (String value: paramSpec.convertToStrings(typedValue)) {- if (paramSpec instanceof SecretInput)- value = SecretInput.LITERAL_VALUE_PREFIX + value;+ if (paramSpec instanceof SecretParam)+ value = SecretParam.LITERAL_VALUE_PREFIX + value;values.add(value);}paramMap.put(paramSpec.getName(), values);diff --git a/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java b/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.javaindex 066ca57876..693e08cf44 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java@@ -6,16 +6,14 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.validation.constraints.Size;-import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.hibernate.validator.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.ScriptChoice;@Editablepublic class ScriptingValues implements ValuesProvider {@@ -26,17 +24,17 @@ public class ScriptingValues implements ValuesProvider {public static final String SECRET_DISPLAY_NAME = "Evaluate script to get secrets";- private List<String> script;+ private String scriptName;@Editable- @Script(Script.GROOVY)- @Size(min=1, message="may not be empty")- public List<String> getScript() {- return script;+ @ScriptChoice+ @NotEmpty+ public String getScriptName() {+ return scriptName;}- public void setScript(List<String> script) {- this.script = script;+ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;}@Override@@ -47,14 +45,14 @@ public class ScriptingValues implements ValuesProvider {return true;ScriptingValues otherScriptingValues = (ScriptingValues) other;return new EqualsBuilder()- .append(script, otherScriptingValues.script)+ .append(scriptName, otherScriptingValues.scriptName).isEquals();}@Overridepublic int hashCode() {return new HashCodeBuilder(17, 37)- .append(script)+ .append(scriptName).toHashCode();}@@ -63,7 +61,7 @@ public class ScriptingValues implements ValuesProvider {public List<List<String>> getValues() {Map<String, Object> variables = new HashMap<>();List<List<String>> values = new ArrayList<>();- for (Object each: (List<Object>) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"), variables)) {+ for (Object each: (List<Object>) GroovyUtils.evalScriptByName(scriptName, variables)) {List<String> strings = new ArrayList<>();if (each instanceof Collection) {strings.addAll((Collection<? extends String>) each);diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BooleanParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BooleanParam.javanew file mode 100755index 0000000000..5f9f435a6c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BooleanParam.java@@ -0,0 +1,64 @@+package io.onedev.server.ci.job.paramspec;++import java.util.List;+import java.util.Map;++import javax.validation.Valid;+import javax.validation.constraints.NotNull;++import io.onedev.server.model.support.inputspec.booleaninput.BooleanInput;+import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.FalseDefaultValue;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=300, name=ParamSpec.BOOLEAN)+public class BooleanParam extends ParamSpec {++ private static final long serialVersionUID = 1L;++ private DefaultValueProvider defaultValueProvider = new FalseDefaultValue();++ @Editable(name="Default Value", order=1000)+ @NotNull(message="may not be empty")+ @Valid+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public List<String> getPossibleValues() {+ return BooleanInput.getPossibleValues();+ }++ @Editable+ @Override+ public boolean isAllowEmpty() {+ return false;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return BooleanInput.getPropertyDef(this, indexes, defaultValueProvider);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return BooleanInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return BooleanInput.convertToStrings(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BuildChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BuildChoiceParam.javanew file mode 100755index 0000000000..2fb0853521--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BuildChoiceParam.java@@ -0,0 +1,43 @@+package io.onedev.server.ci.job.paramspec;++import java.util.List;+import java.util.Map;++import io.onedev.server.model.support.inputspec.BuildChoiceInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=1200, name=ParamSpec.BUILD)+public class BuildChoiceParam extends ParamSpec {++ private static final long serialVersionUID = 1L;++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return BuildChoiceInput.getPropertyDef(this, indexes);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return BuildChoiceInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return BuildChoiceInput.convertToStrings(value);+ }++ @Override+ public long getOrdinal(Object fieldValue) {+ if (fieldValue != null)+ return (Long) fieldValue;+ else+ return super.getOrdinal(fieldValue);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ChoiceParam.javanew file mode 100755index 0000000000..1b49301f1a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ChoiceParam.java@@ -0,0 +1,106 @@+package io.onedev.server.ci.job.paramspec;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.Valid;+import javax.validation.constraints.NotNull;++import io.onedev.server.model.support.inputspec.choiceinput.ChoiceInput;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;+import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.EditContext;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.ShowCondition;++@Editable(order=145, name=ParamSpec.ENUMERATION)+public class ChoiceParam extends ParamSpec {++ private static final long serialVersionUID = 1L;++ private ChoiceProvider choiceProvider = new SpecifiedChoices();++ private DefaultValueProvider defaultValueProvider;++ private DefaultMultiValueProvider defaultMultiValueProvider;++ @Editable(order=1000, name="Available Choices")+ @NotNull(message="may not be empty")+ @Valid+ public ChoiceProvider getChoiceProvider() {+ return choiceProvider;+ }++ public void setChoiceProvider(ChoiceProvider choiceProvider) {+ this.choiceProvider = choiceProvider;+ }++ @ShowCondition("isDefaultValueProviderVisible")+ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @SuppressWarnings("unused")+ private static boolean isDefaultValueProviderVisible() {+ return EditContext.get().getInputValue("allowMultiple").equals(false);+ }++ @ShowCondition("isDefaultMultiValueProviderVisible")+ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultMultiValueProvider getDefaultMultiValueProvider() {+ return defaultMultiValueProvider;+ }++ public void setDefaultMultiValueProvider(DefaultMultiValueProvider defaultMultiValueProvider) {+ this.defaultMultiValueProvider = defaultMultiValueProvider;+ }++ @SuppressWarnings("unused")+ private static boolean isDefaultMultiValueProviderVisible() {+ return EditContext.get().getInputValue("allowMultiple").equals(true);+ }++ @Override+ public List<String> getPossibleValues() {+ return ChoiceInput.getPossibleValues(choiceProvider);+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return ChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return ChoiceInput.convertToObject(this, strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return ChoiceInput.convertToStrings(this, value);+ }++ @Override+ public long getOrdinal(Object fieldValue) {+ if (fieldValue != null) {+ List<String> choices = new ArrayList<>(getChoiceProvider().getChoices(true).keySet());+ return choices.indexOf(fieldValue);+ } else {+ return super.getOrdinal(fieldValue);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/CommitParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/CommitParam.javanew file mode 100755index 0000000000..18d60a8f07--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/CommitParam.java@@ -0,0 +1,35 @@+package io.onedev.server.ci.job.paramspec;++import java.util.List;+import java.util.Map;++import io.onedev.server.model.support.inputspec.CommitInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=1400, name=ParamSpec.COMMIT)+public class CommitParam extends ParamSpec {++ private static final long serialVersionUID = 1L;++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return CommitInput.getPropertyDef(this, indexes);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return CommitInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return CommitInput.convertToStrings(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/DateParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/DateParam.javanew file mode 100755index 0000000000..721b119eb5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/DateParam.java@@ -0,0 +1,61 @@+package io.onedev.server.ci.job.paramspec;++import java.util.Date;+import java.util.List;+import java.util.Map;++import javax.validation.Valid;++import io.onedev.server.model.support.inputspec.dateinput.DateInput;+import io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;++@Editable(order=505, name=ParamSpec.DATE)+public class DateParam extends ParamSpec {++ private static final long serialVersionUID = 1L;++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return DateInput.getPropertyDef(this, indexes, defaultValueProvider);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return DateInput.convertToObject(strings);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return DateInput.convertToStrings(value);+ }++ @Override+ public long getOrdinal(Object fieldValue) {+ if (fieldValue instanceof Date)+ return ((Date)fieldValue).getTime();+ else+ return super.getOrdinal(fieldValue);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/GroupChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/GroupChoiceParam.javanew file mode 100755index 0000000000..a624e6f8f5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/GroupChoiceParam.java@@ -0,0 +1,73 @@+package io.onedev.server.ci.job.paramspec;++import java.util.List;+import java.util.Map;++import javax.validation.Valid;+import javax.validation.constraints.NotNull;++import io.onedev.server.model.support.inputspec.groupchoiceinput.GroupChoiceInput;+import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.AllGroups;+import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;++@Editable(order=160, name=ParamSpec.GROUP)+public class GroupChoiceParam extends ParamSpec {++ private static final long serialVersionUID = 1L;++ private ChoiceProvider choiceProvider = new AllGroups();++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, name="Available Choices")+ @NotNull(message="may not be empty")+ @Valid+ public ChoiceProvider getChoiceProvider() {+ return choiceProvider;+ }++ public void setChoiceProvider(ChoiceProvider choiceProvider) {+ this.choiceProvider = choiceProvider;+ }++ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public List<String> getPossibleValues() {+ return GroupChoiceInput.getPossibleValues(choiceProvider);+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return GroupChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return GroupChoiceInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return GroupChoiceInput.convertToStrings(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/IssueChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/IssueChoiceParam.javanew file mode 100755index 0000000000..8cf467f5b3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/IssueChoiceParam.java@@ -0,0 +1,43 @@+package io.onedev.server.ci.job.paramspec;++import java.util.List;+import java.util.Map;++import io.onedev.server.model.support.inputspec.IssueChoiceInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=1100, name=ParamSpec.ISSUE)+public class IssueChoiceParam extends ParamSpec {++ private static final long serialVersionUID = 1L;++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return IssueChoiceInput.getPropertyDef(this, indexes);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return IssueChoiceInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return IssueChoiceInput.convertToStrings(value);+ }++ @Override+ public long getOrdinal(Object fieldValue) {+ if (fieldValue != null)+ return (Long) fieldValue;+ else+ return super.getOrdinal(fieldValue);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/NumberParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/NumberParam.javanew file mode 100755index 0000000000..8eb6626b0f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/NumberParam.java@@ -0,0 +1,82 @@+package io.onedev.server.ci.job.paramspec;++import java.util.List;+import java.util.Map;++import javax.validation.Valid;++import io.onedev.server.model.support.inputspec.numberinput.NumberInput;+import io.onedev.server.model.support.inputspec.numberinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;++@Editable(order=400, name=ParamSpec.NUMBER)+public class NumberParam extends ParamSpec {++ private static final long serialVersionUID = 1L;++ private Integer minValue;++ private Integer maxValue;++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, description="Optionally specify the minimum value allowed.")+ public Integer getMinValue() {+ return minValue;+ }++ public void setMinValue(Integer minValue) {+ this.minValue = minValue;+ }++ @Editable(order=1100, description="Optionally specify the maximum value allowed.")+ public Integer getMaxValue() {+ return maxValue;+ }++ public void setMaxValue(Integer maxValue) {+ this.maxValue = maxValue;+ }++ @Editable(order=1200, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return NumberInput.getPropertyDef(this, indexes, minValue, maxValue, defaultValueProvider);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return NumberInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return NumberInput.convertToStrings(value);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public long getOrdinal(Object fieldValue) {+ if (fieldValue != null)+ return (Integer)fieldValue;+ else+ return super.getOrdinal(fieldValue);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ParamSpec.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ParamSpec.javanew file mode 100755index 0000000000..5729d0fadf--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ParamSpec.java@@ -0,0 +1,78 @@+package io.onedev.server.ci.job.paramspec;++import javax.validation.Valid;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;+import io.onedev.server.util.validation.annotation.FieldName;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;++@Editable+public abstract class ParamSpec extends InputSpec {++ private static final long serialVersionUID = 1L;++ @Editable(order=10)+ @FieldName+ @NotEmpty+ @Override+ public String getName() {+ return super.getName();+ }++ @Override+ public void setName(String name) {+ super.setName(name);+ }++ @Editable(order=30, description="Optionally describes the param")+ @NameOfEmptyValue("No description")+ @Override+ public String getDescription() {+ return super.getDescription();+ }++ @Override+ public void setDescription(String description) {+ super.setDescription(description);+ }++ @Editable(order=35, description="Whether or not multiple values can be specified for this param")+ @Override+ public boolean isAllowMultiple() {+ return super.isAllowMultiple();+ }++ @Override+ public void setAllowMultiple(boolean allowMultiple) {+ super.setAllowMultiple(allowMultiple);+ }++ @Editable(order=40, name="Show Conditionally", description="Enable if visibility of this param depends on other params")+ @NameOfEmptyValue("Always")+ @Valid+ @Override+ public ShowCondition getShowCondition() {+ return super.getShowCondition();+ }++ @Override+ public void setShowCondition(ShowCondition showCondition) {+ super.setShowCondition(showCondition);+ }++ @Editable(order=50, name="Allow Empty Value", description="Whether or not this param accepts empty value")+ @Override+ public boolean isAllowEmpty() {+ return super.isAllowEmpty();+ }++ @Override+ public void setAllowEmpty(boolean allowEmpty) {+ super.setAllowEmpty(allowEmpty);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/PullRequestChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/PullRequestChoiceParam.javanew file mode 100755index 0000000000..cc06845c43--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/PullRequestChoiceParam.java@@ -0,0 +1,43 @@+package io.onedev.server.ci.job.paramspec;++import java.util.List;+import java.util.Map;++import io.onedev.server.model.support.inputspec.PullRequestChoiceInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=1000, name=ParamSpec.PULLREQUEST)+public class PullRequestChoiceParam extends ParamSpec {++ private static final long serialVersionUID = 1L;++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return PullRequestChoiceInput.getPropertyDef(this, indexes);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return PullRequestChoiceInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return PullRequestChoiceInput.convertToStrings(value);+ }++ @Override+ public long getOrdinal(Object fieldValue) {+ if (fieldValue != null)+ return (Long) fieldValue;+ else+ return super.getOrdinal(fieldValue);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/SecretParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/SecretParam.javanew file mode 100755index 0000000000..2b58c49555--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/SecretParam.java@@ -0,0 +1,43 @@+package io.onedev.server.ci.job.paramspec;++import java.util.List;+import java.util.Map;++import io.onedev.server.model.support.inputspec.SecretInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=500, name=ParamSpec.SECRET)+public class SecretParam extends ParamSpec {++ private static final long serialVersionUID = 1L;++ public static final String LITERAL_VALUE_PREFIX = "$OneDev-Secret-Literal$";++ @Editable+ @Override+ public boolean isAllowEmpty() {+ return false;+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return SecretInput.getPropertyDef(this, indexes);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return SecretInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return SecretInput.convertToStrings(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/TextParam.javaold mode 100644new mode 100755similarity index 54%rename from server-core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.javarename to server-core/src/main/java/io/onedev/server/ci/job/paramspec/TextParam.javaindex 736cca5b95..df9fb3a2b2--- a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/TextParam.java@@ -1,20 +1,17 @@-package io.onedev.server.util.inputspec.textinput;+package io.onedev.server.ci.job.paramspec;-import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;+import javax.validation.Valid;-import com.google.common.collect.Lists;--import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.model.support.inputspec.textinput.TextInput;+import io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-@Editable(order=100, name=InputSpec.TEXT)-public class TextInput extends InputSpec {+@Editable(order=100, name=ParamSpec.TEXT)+public class TextParam extends ParamSpec {private static final long serialVersionUID = 1L;@@ -45,6 +42,7 @@ public class TextInput extends InputSpec {@Editable(order=1200, name="Default Value")@NameOfEmptyValue("No default value")+ @Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;}@@ -61,37 +59,17 @@ public class TextInput extends InputSpec {@Overridepublic String getPropertyDef(Map<String, Integer> indexes) {- int index = indexes.get(getName());- StringBuffer buffer = new StringBuffer();- appendField(buffer, index, "String");- appendCommonAnnotations(buffer, index);- if (!isAllowEmpty())- buffer.append(" @NotEmpty\n");- if (isMultiline())- buffer.append(" @Multiline\n");- if (getPattern() != null)- buffer.append(" @Pattern(regexp=\"" + pattern + "\", message=\"Should match regular expression: " + pattern + "\")\n");- appendMethods(buffer, index, "String", null, defaultValueProvider);-- return buffer.toString();+ return TextInput.getPropertyDef(this, indexes, pattern, defaultValueProvider, multiline);}@Overridepublic Object convertToObject(List<String> strings) {- if (strings.size() == 0)- return null;- else if (strings.size() == 1)- return strings.iterator().next();- else- throw new ValidationException("Not eligible for multi-value");+ return TextInput.convertToObject(strings);}@Overridepublic List<String> convertToStrings(Object value) {- if (value instanceof String)- return Lists.newArrayList((String)value);- else- return new ArrayList<>();+ return TextInput.convertToStrings(value);}}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.javanew file mode 100755index 0000000000..59fd30fd45--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.java@@ -0,0 +1,76 @@+package io.onedev.server.ci.job.paramspec;++import java.util.List;+import java.util.Map;+import java.util.stream.Collectors;++import javax.validation.Valid;+import javax.validation.constraints.NotNull;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.inputspec.userchoiceinput.UserChoiceInput;+import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.IssueReaders;+import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;++@Editable(order=150, name=ParamSpec.USER)+public class UserChoiceParam extends ParamSpec {++ private static final long serialVersionUID = 1L;++ private ChoiceProvider choiceProvider = new IssueReaders();++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, name="Available Choices")+ @NotNull(message="may not be empty")+ @Valid+ public ChoiceProvider getChoiceProvider() {+ return choiceProvider;+ }++ public void setChoiceProvider(ChoiceProvider choiceProvider) {+ this.choiceProvider = choiceProvider;+ }++ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public List<String> getPossibleValues() {+ return OneDev.getInstance(UserManager.class).query().stream().map(user->user.getName()).collect(Collectors.toList());+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return UserChoiceInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return UserChoiceInput.convertToStrings(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.javaindex 3fa0a5d0d3..534defa0c4 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java@@ -12,9 +12,8 @@ import io.onedev.server.ci.job.Job;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.GitUtils;-import io.onedev.server.util.OneContext;+import io.onedev.server.model.Project;import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.web.editable.annotation.BranchPatterns;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;@@ -34,7 +33,7 @@ public class BranchUpdateTrigger extends JobTrigger {@Editable(name="Branches", order=100,description="Optionally specify space-separated branches to check. Use * or ? for wildcard match. "+ "Leave empty to match all branches")- @BranchPatterns+ @Patterns(suggester = "suggestBranches")@NameOfEmptyValue("Any branch")public String getBranches() {return branches;@@ -44,10 +43,15 @@ public class BranchUpdateTrigger extends JobTrigger {this.branches = branches;}+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestBranches(String matchWith) {+ return SuggestionUtils.suggestBranches(Project.get(), matchWith);+ }+@Editable(name="Touched Files", order=200,description="Optionally specify space-separated files to check. Use * or ? for wildcard match. "+ "Leave empty to match all files")- @Patterns("getPathSuggestions")+ @Patterns(suggester = "getPathSuggestions")@NameOfEmptyValue("Any file")public String getPaths() {return paths;@@ -69,7 +73,7 @@ public class BranchUpdateTrigger extends JobTrigger {@SuppressWarnings("unused")private static List<InputSuggestion> getPathSuggestions(String matchWith) {- return SuggestionUtils.suggestBlobs(OneContext.get().getProject(), matchWith);+ return SuggestionUtils.suggestBlobs(Project.get(), matchWith);}private boolean touchedFile(RefUpdated refUpdated) {diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.javaindex a661e51925..4a6525317e 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java@@ -4,14 +4,16 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;+import javax.validation.Valid;+import org.apache.wicket.Component;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobAware;import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.event.ProjectEvent;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.ComponentContext;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.ParamSpecProvider;@@ -27,6 +29,7 @@ public abstract class JobTrigger implements Serializable {@Editable(name="Trigger Parameters", order=1000)@ParamSpecProvider("getParamSpecs")@OmitName+ @Validpublic List<JobParam> getParams() {return params;}@@ -36,8 +39,8 @@ public abstract class JobTrigger implements Serializable {}@SuppressWarnings("unused")- private static List<InputSpec> getParamSpecs() {- Component component = OneContext.get().getComponent();+ private static List<ParamSpec> getParamSpecs() {+ Component component = ComponentContext.get().getComponent();JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);if (jobAware != null) {Job job = jobAware.getJob();diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/ci/job/trigger/TagCreateTrigger.javaindex e083feb481..33007a42ea 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/TagCreateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/trigger/TagCreateTrigger.java@@ -1,16 +1,21 @@package io.onedev.server.ci.job.trigger;+import java.util.List;+import org.eclipse.jgit.lib.ObjectId;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.match.PathMatcher;import io.onedev.server.ci.job.Job;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Project;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.TagPatterns;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;@Editable(order=200, name="When create tags")public class TagCreateTrigger extends JobTrigger {@@ -22,7 +27,7 @@ public class TagCreateTrigger extends JobTrigger {@Editable(name="Tags", order=100,description="Optionally specify space-separated tags to check. Use * or ? for wildcard match. "+ "Leave empty to match all tags")- @TagPatterns+ @Patterns(suggester = "suggestTags")@NameOfEmptyValue("Any tag")public String getTags() {return tags;@@ -31,6 +36,11 @@ public class TagCreateTrigger extends JobTrigger {public void setTags(String tags) {this.tags = tags;}++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestTags(String matchWith) {+ return SuggestionUtils.suggestTags(Project.get(), matchWith);+ }@Overridepublic boolean matches(ProjectEvent event, Job job) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.javaindex 3f1db85f3d..df666a81de 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java@@ -5,13 +5,14 @@ import java.util.List;import javax.annotation.Nullable;import io.onedev.server.model.Setting;-import io.onedev.server.model.support.authenticator.Authenticator;-import io.onedev.server.model.support.jobexecutor.JobExecutor;-import io.onedev.server.model.support.setting.BackupSetting;-import io.onedev.server.model.support.setting.GlobalIssueSetting;-import io.onedev.server.model.support.setting.MailSetting;-import io.onedev.server.model.support.setting.SecuritySetting;-import io.onedev.server.model.support.setting.SystemSetting;+import io.onedev.server.model.support.administration.BackupSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.MailSetting;+import io.onedev.server.model.support.administration.SecuritySetting;+import io.onedev.server.model.support.administration.SystemSetting;+import io.onedev.server.model.support.administration.authenticator.Authenticator;+import io.onedev.server.model.support.administration.groovyscript.GroovyScript;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.persistence.dao.EntityManager;public interface SettingManager extends EntityManager<Setting> {@@ -105,4 +106,8 @@ public interface SettingManager extends EntityManager<Setting> {void saveJobExecutors(List<JobExecutor> jobExecutors);+ List<GroovyScript> getGroovyScripts();++ void saveGroovyScripts(List<GroovyScript> jobScripts);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.javaindex 0d1166cd36..4888b747c6 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java@@ -12,7 +12,7 @@ import io.onedev.server.model.Group;import io.onedev.server.model.Project;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;-import io.onedev.server.model.support.authenticator.Authenticator;+import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.javaindex 064ca507cc..fe6f537ee8 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java@@ -16,11 +16,11 @@ import javax.persistence.criteria.Root;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.util.inputspec.InputSpec;@Singletonpublic class DefaultIssueFieldManager extends AbstractEntityManager<IssueField> implements IssueFieldManager {@@ -59,7 +59,7 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>@Overridepublic void onRenameGroup(String oldName, String newName) {Query query = getSession().createQuery("update IssueField set value=:newName where type=:groupChoice and value=:oldName");- query.setParameter("groupChoice", InputSpec.GROUP);+ query.setParameter("groupChoice", FieldSpec.GROUP);query.setParameter("oldName", oldName);query.setParameter("newName", newName);query.executeUpdate();@@ -69,7 +69,7 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>@Overridepublic void onRenameUser(String oldName, String newName) {Query query = getSession().createQuery("update IssueField set value=:newName where type=:userChoice and value=:oldName");- query.setParameter("userChoice", InputSpec.USER);+ query.setParameter("userChoice", FieldSpec.USER);query.setParameter("oldName", oldName);query.setParameter("newName", newName);query.executeUpdate();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 244d5b2b6c..7138f8b8b5 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@@ -43,9 +43,11 @@ import io.onedev.server.model.IssueQuerySetting;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.StateSpec;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;@@ -60,8 +62,6 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.MilestoneCriteria;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;@@ -309,7 +309,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsQuery<?> query = getSession().createQuery("select distinct name from IssueField");Set<String> undefinedFields = new HashSet<>();for (String fieldName: (List<String>)query.getResultList()) {- InputSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);+ FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);if (field == null)undefinedFields.add(fieldName);}@@ -378,7 +378,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Overridepublic Collection<UndefinedFieldValue> getUndefinedFieldValues() {Query query = getSession().createQuery("select distinct name, value from IssueField where type=:choice");- query.setParameter("choice", InputSpec.ENUMERATION);+ query.setParameter("choice", FieldSpec.ENUMERATION);Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();for (Object[] row: (List<Object[]>)query.getResultList()) {String fieldName = (String) row[0];@@ -449,7 +449,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Overridepublic void fixFieldValueOrders() {Query query = getSession().createQuery("select distinct name, value, ordinal from IssueField where type=:choice");- query.setParameter("choice", InputSpec.ENUMERATION);+ query.setParameter("choice", FieldSpec.ENUMERATION);for (Object[] row: (List<Object[]>)query.getResultList()) {String name = (String) row[0];diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.javaindex fe7d0c7205..4632f5fe8f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java@@ -22,11 +22,11 @@ import io.onedev.server.event.issue.IssueOpened;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;-import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 318384bc7f..f284a0058f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -14,8 +14,6 @@ import javax.inject.Inject;import javax.inject.Singleton;import org.apache.commons.io.IOUtils;-import org.apache.shiro.subject.Subject;-import org.apache.shiro.util.ThreadContext;import org.eclipse.jgit.api.Git;import org.eclipse.jgit.api.errors.GitAPIException;import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm;@@ -52,7 +50,8 @@ import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;-import io.onedev.server.model.support.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.groovyscript.GroovyScript;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Transactional;@@ -161,6 +160,8 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemif (oldName != null && !oldName.equals(project.getName())) {for (JobExecutor jobExecutor: settingManager.getJobExecutors())jobExecutor.onRenameProject(oldName, project.getName());+ for (GroovyScript groovyScript: settingManager.getGroovyScripts())+ groovyScript.onRenameProject(oldName, project.getName());}}@@ -174,6 +175,10 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemusage.add(jobExecutor.onDeleteProject(project.getName(), index).prefix("administration"));index++;}+ for (GroovyScript groovyScript: settingManager.getGroovyScripts()) {+ usage.add(groovyScript.onDeleteProject(project.getName(), index).prefix("administration"));+ index++;+ }usage.checkInUse("Project '" + project.getName() + "'");@@ -339,7 +344,6 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemthrow ExceptionUtils.unchecked(e);}- Subject subject = SecurityUtils.getSubject();Long projectId = project.getId();transactionManager.runAfterCommit(new Runnable() {@@ -349,16 +353,11 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem@Overridepublic void run() {- ThreadContext.bind(subject);- try {- Project project = load(projectId);- listenerRegistry.post(new RefUpdated(project, refName, commitId, ObjectId.zeroId()));- } finally {- ThreadContext.unbindSubject();- }+ Project project = load(projectId);+ listenerRegistry.post(new RefUpdated(project, refName, commitId, ObjectId.zeroId()));}- });+ }, SecurityUtils.getSubject());}});@@ -395,7 +394,6 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemthrow new RuntimeException(e);}- Subject subject = SecurityUtils.getSubject();Long projectId = project.getId();transactionManager.runAfterCommit(new Runnable() {@@ -405,16 +403,11 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem@Overridepublic void run() {- ThreadContext.bind(subject);- try {- Project project = load(projectId);- listenerRegistry.post(new RefUpdated(project, refName, commitId, ObjectId.zeroId()));- } finally {- ThreadContext.unbindSubject();- }+ Project project = load(projectId);+ listenerRegistry.post(new RefUpdated(project, refName, commitId, ObjectId.zeroId()));}- });+ }, SecurityUtils.getSubject());}});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 b6cc6df0e9..4907a77990 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@@ -20,6 +20,7 @@ import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.Set;+import java.util.stream.Collectors;import javax.inject.Inject;import javax.inject.Singleton;@@ -27,12 +28,9 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import javax.validation.ValidationException;import org.apache.commons.lang3.StringUtils;import org.apache.shiro.authz.Permission;-import org.apache.shiro.subject.Subject;-import org.apache.shiro.util.ThreadContext;import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.lib.CommitBuilder;import org.eclipse.jgit.lib.ObjectId;@@ -52,6 +50,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;@@ -129,6 +128,8 @@ import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.reviewrequirement.ReviewRequirement;+import io.onedev.server.util.scriptidentity.JobIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentity;import io.onedev.server.util.work.BatchWorkManager;import io.onedev.server.util.work.BatchWorker;@@ -170,7 +171,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestPullRequestReviewManager pullRequestReviewManager, UserManager userManager,MarkdownManager markdownManager, BatchWorkManager batchWorkManager,ListenerRegistry listenerRegistry, SessionManager sessionManager,- PullRequestChangeManager pullRequestChangeManager,+ PullRequestChangeManager pullRequestChangeManager,PullRequestBuildManager pullRequestBuildManager, TransactionManager transactionManager,JobManager jobManager, ProjectManager projectManager) {super(dao);@@ -254,7 +255,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestchange.setRequest(request);change.setUser(user);pullRequestChangeManager.save(change);- checkAsync(request);+ checkAsync(Lists.newArrayList(request));}@Transactional@@ -327,7 +328,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestrequest.getTargetProject().cacheObjectId(request.getTargetRef(), mergedId);Long requestId = request.getId();- Subject subject = SecurityUtils.getSubject();ObjectId newTargetHeadId = mergedId;transactionManager.runAfterCommit(new Runnable() {@@ -337,18 +337,13 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Overridepublic void run() {- ThreadContext.bind(subject);- try {- PullRequest request = load(requestId);- request.getTargetProject().cacheObjectId(request.getTargetRef(), newTargetHeadId);- listenerRegistry.post(new RefUpdated(request.getTargetProject(), targetRef,- targetHeadId, newTargetHeadId));- } finally {- ThreadContext.unbindSubject();- }+ PullRequest request = load(requestId);+ request.getTargetProject().cacheObjectId(request.getTargetRef(), newTargetHeadId);+ listenerRegistry.post(new RefUpdated(request.getTargetProject(), targetRef,+ targetHeadId, newTargetHeadId));}- });+ }, SecurityUtils.getSubject());}});}@@ -377,7 +372,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpullRequestReviewManager.saveReviews(request);pullRequestBuildManager.savePullRequestBuilds(request);- checkAsync(request);+ checkAsync(Lists.newArrayList(request));listenerRegistry.post(new PullRequestOpened(request));}@@ -459,11 +454,14 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}}}- } catch (ValidationException|OneException e) {- request.setCheckError(e.getMessage());} catch (Exception e) {- request.setCheckError("Error checking pull request, check server log for details");- String message = String.format("Error checking pull request (project: %s, number: %d)",+ if (e.getMessage() != null)+ request.setCheckError("Error checking pull request: " + e.getMessage());+ else+ request.setCheckError("Error checking pull request");+ request.setCheckError(request.getCheckError() + ", check server log for details");++ String message = String.format("Error checking pull request (project: %s, number: #%d)",request.getTargetProject().getName(), request.getNumber());logger.error(message, e);}@@ -563,8 +561,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestCriterion criterion = Restrictions.and(ofOpen(),Restrictions.or(ofSource(projectAndBranch), ofTarget(projectAndBranch)));- for (PullRequest request: query(EntityCriteria.of(PullRequest.class).add(criterion)))- check(request);+ checkAsync(query(EntityCriteria.of(PullRequest.class).add(criterion)));}}@@ -626,7 +623,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestif (data instanceof PullRequestApproveData || data instanceof PullRequestDiscardData|| data instanceof PullRequestReviewerRemoveData || data instanceof PullRequestReviewerAddData|| data instanceof PullRequestMergeStrategyChangeData) {- checkAsync(event.getRequest());+ checkAsync(Lists.newArrayList(event.getRequest()));}}@@ -647,21 +644,22 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactionalpublic void on(BuildEvent event) {Build build = event.getBuild();- for (PullRequestBuild pullRequestBuild: build.getPullRequestBuilds()) {+ for (PullRequestBuild pullRequestBuild: build.getPullRequestBuilds())listenerRegistry.post(new PullRequestBuildEvent(pullRequestBuild));- checkAsync(pullRequestBuild.getRequest());- }+ checkAsync(build.getPullRequestBuilds()+ .stream()+ .map(it->it.getRequest())+ .collect(Collectors.toList()));}@Listenpublic void on(PullRequestMergePreviewCalculated event) {- checkAsync(event.getRequest());+ checkAsync(Lists.newArrayList(event.getRequest()));}@Sessional- protected void checkAsync(PullRequest request) {- Long requestId = request.getId();- Subject subject = SecurityUtils.getSubject();+ protected void checkAsync(Collection<PullRequest> requests) {+ Collection<Long> requestIds = requests.stream().map(it->it.getId()).collect(Collectors.toList());transactionManager.runAfterCommit(new Runnable() {@Override@@ -670,15 +668,11 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Overridepublic void run() {- try {- ThreadContext.bind(subject);- check(load(requestId));- } finally {- ThreadContext.unbindSubject();- }+ for (Long requestId: requestIds)+ check(load(requestId));}- });+ }, SecurityUtils.getSubject());}});@@ -726,43 +720,48 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestif (preview != null && preview.getMerged() != null) {Project project = request.getTargetProject();ObjectId commitId = ObjectId.fromString(preview.getMerged());- CISpec ciSpec = project.getCISpec(commitId);- if (ciSpec == null)- throw new OneException("No CI spec defined in merge preview commit");- for (Job job: ciSpec.getJobs()) {- for (JobTrigger trigger: job.getTriggers()) {- if (trigger instanceof BranchUpdateTrigger) {- BranchUpdateTrigger branchUpdateTrigger = (BranchUpdateTrigger) trigger;- if (branchUpdateTrigger.isRejectIfNotSuccessful()) {- RefUpdated updated = new RefUpdated(project, GitUtils.branch2ref(request.getTargetBranch()),- request.getTarget().getObjectId(), commitId);- if (branchUpdateTrigger.matches(updated, job)) {- new MatrixRunner<List<String>>(JobParam.getParamMatrix(trigger.getParams())) {-- @Override- public void run(Map<String, List<String>> paramMap) {- Build build = jobManager.submit(request.getTargetProject(),- commitId, job.getName(), paramMap, null);- PullRequestBuild pullRequestBuild = null;- for (PullRequestBuild prevRequirement: prevRequirements) {- if (prevRequirement.getBuild().equals(build)) {- pullRequestBuild = prevRequirement;- break;+ ScriptIdentity.push(new JobIdentity(project, commitId));+ try {+ CISpec ciSpec = project.getCISpec(commitId);+ if (ciSpec != null) {+ for (Job job: ciSpec.getJobs()) {+ for (JobTrigger trigger: job.getTriggers()) {+ if (trigger instanceof BranchUpdateTrigger) {+ BranchUpdateTrigger branchUpdateTrigger = (BranchUpdateTrigger) trigger;+ if (branchUpdateTrigger.isRejectIfNotSuccessful()) {+ RefUpdated updated = new RefUpdated(project, GitUtils.branch2ref(request.getTargetBranch()),+ request.getTarget().getObjectId(), commitId);+ if (branchUpdateTrigger.matches(updated, job)) {+ new MatrixRunner<List<String>>(JobParam.getParamMatrix(trigger.getParams())) {++ @Override+ public void run(Map<String, List<String>> paramMap) {+ Build build = jobManager.submit(request.getTargetProject(),+ commitId, job.getName(), paramMap, null);+ PullRequestBuild pullRequestBuild = null;+ for (PullRequestBuild prevRequirement: prevRequirements) {+ if (prevRequirement.getBuild().equals(build)) {+ pullRequestBuild = prevRequirement;+ break;+ }+ }+ if (pullRequestBuild == null) {+ pullRequestBuild = new PullRequestBuild();+ pullRequestBuild.setRequest(request);+ pullRequestBuild.setBuild(build);+ }+ request.getPullRequestBuilds().add(pullRequestBuild);}- }- if (pullRequestBuild == null) {- pullRequestBuild = new PullRequestBuild();- pullRequestBuild.setRequest(request);- pullRequestBuild.setBuild(build);- }- request.getPullRequestBuilds().add(pullRequestBuild);++ }.run();}-- }.run();+ }}}}}+ } finally {+ ScriptIdentity.pop();}}}@@ -1048,7 +1047,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestList<PullRequest> requests = new ArrayList<>();EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq("project", targetProject));+ criteria.add(Restrictions.eq("targetProject", targetProject));if (StringUtils.isNotBlank(term)) {if (term.startsWith("#")) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.javaindex 46c9cbab49..b5c3a44e05 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java@@ -14,13 +14,14 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.maintenance.DataManager;import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;-import io.onedev.server.model.support.authenticator.Authenticator;-import io.onedev.server.model.support.jobexecutor.JobExecutor;-import io.onedev.server.model.support.setting.BackupSetting;-import io.onedev.server.model.support.setting.GlobalIssueSetting;-import io.onedev.server.model.support.setting.MailSetting;-import io.onedev.server.model.support.setting.SecuritySetting;-import io.onedev.server.model.support.setting.SystemSetting;+import io.onedev.server.model.support.administration.BackupSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.MailSetting;+import io.onedev.server.model.support.administration.SecuritySetting;+import io.onedev.server.model.support.administration.SystemSetting;+import io.onedev.server.model.support.administration.authenticator.Authenticator;+import io.onedev.server.model.support.administration.groovyscript.GroovyScript;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;@@ -46,6 +47,8 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implemprivate volatile Long jobExecutorsId;+ private volatile Long jobScriptsId;+@Injectpublic DefaultSettingManager(Dao dao, DataManager dataManager) {super(dao);@@ -246,4 +249,31 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implemdao.persist(setting);}+ @Sessional+ @SuppressWarnings("unchecked")+ @Override+ public List<GroovyScript> getGroovyScripts() {+ Setting setting;+ if (jobScriptsId == null) {+ setting = getSetting(Key.JOB_SCRIPTS);+ Preconditions.checkNotNull(setting);+ jobScriptsId = setting.getId();+ } else {+ setting = load(jobScriptsId);+ }+ return (List<GroovyScript>) setting.getValue();+ }++ @Transactional+ @Override+ public void saveGroovyScripts(List<GroovyScript> jobScripts) {+ Setting setting = getSetting(Key.JOB_SCRIPTS);+ if (setting == null) {+ setting = new Setting();+ setting.setKey(Key.JOB_SCRIPTS);+ }+ setting.setValue((Serializable) jobScripts);+ dao.persist(setting);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/BuildCommitAware.java b/server-core/src/main/java/io/onedev/server/event/BuildCommitAware.javadeleted file mode 100644index 099f948410..0000000000--- a/server-core/src/main/java/io/onedev/server/event/BuildCommitAware.java+++ /dev/null@@ -1,9 +0,0 @@-package io.onedev.server.event;--import org.eclipse.jgit.lib.ObjectId;--public interface BuildCommitAware {-- ObjectId getBuildCommit();--}diff --git a/server-core/src/main/java/io/onedev/server/event/RefUpdated.java b/server-core/src/main/java/io/onedev/server/event/RefUpdated.javaindex f98b563d35..71ff90107e 100644--- a/server-core/src/main/java/io/onedev/server/event/RefUpdated.java+++ b/server-core/src/main/java/io/onedev/server/event/RefUpdated.java@@ -3,8 +3,9 @@ package io.onedev.server.event;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.model.Project;+import io.onedev.server.util.CommitAware;-public class RefUpdated extends ProjectEvent implements BuildCommitAware {+public class RefUpdated extends ProjectEvent implements CommitAware {private final String refName;@@ -32,7 +33,7 @@ public class RefUpdated extends ProjectEvent implements BuildCommitAware {}@Override- public ObjectId getBuildCommit() {+ public ObjectId getCommitId() {return newCommitId;}diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.javaindex 3346a7db10..97337b529d 100644--- a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java@@ -4,12 +4,12 @@ import java.util.Date;import org.eclipse.jgit.lib.ObjectId;-import io.onedev.server.event.BuildCommitAware;import io.onedev.server.event.ProjectEvent;import io.onedev.server.model.Build;import io.onedev.server.model.User;+import io.onedev.server.util.CommitAware;-public class BuildEvent extends ProjectEvent implements BuildCommitAware {+public class BuildEvent extends ProjectEvent implements CommitAware {private Build build;@@ -27,7 +27,7 @@ public class BuildEvent extends ProjectEvent implements BuildCommitAware {}@Override- public ObjectId getBuildCommit() {+ public ObjectId getCommitId() {return ObjectId.fromString(build.getCommitHash());}diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.javaindex 9899b77690..c46faeb40b 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java@@ -10,8 +10,8 @@ import io.onedev.server.event.MarkdownAware;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.Input;-import io.onedev.server.util.inputspec.InputSpec;public class IssueOpened extends IssueEvent implements MarkdownAware {@@ -34,7 +34,7 @@ public class IssueOpened extends IssueEvent implements MarkdownAware {Map<String, User> newUsers = new HashMap<>();UserManager userManager = OneDev.getInstance(UserManager.class);for (Input field: getIssue().getFieldInputs().values()) {- if (field.getType().equals(InputSpec.USER)) {+ if (field.getType().equals(FieldSpec.USER)) {if (!field.getValues().isEmpty()) {User newUser = userManager.findByName(field.getValues().iterator().next());if (newUser != null)@@ -50,7 +50,7 @@ public class IssueOpened extends IssueEvent implements MarkdownAware {Map<String, Group> newGroups = new HashMap<>();GroupManager groupManager = OneDev.getInstance(GroupManager.class);for (Input field: getIssue().getFieldInputs().values()) {- if (field.getType().equals(InputSpec.GROUP)) {+ if (field.getType().equals(FieldSpec.GROUP)) {if (!field.getValues().isEmpty()) {Group newGroup = groupManager.find(field.getValues().iterator().next());if (newGroup != null)diff --git a/server-core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.javaindex aad07eaa16..07cf4d53cf 100644--- a/server-core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java@@ -12,12 +12,13 @@ import javax.servlet.http.HttpServlet;import javax.servlet.http.HttpServletRequest;import javax.servlet.http.HttpServletResponse;-import org.apache.shiro.util.ThreadContext;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.RefUpdate;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.google.common.base.Preconditions;+import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.StringUtils;import io.onedev.server.entitymanager.ProjectManager;@@ -26,8 +27,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.persistence.SessionManager;-import com.google.common.base.Preconditions;-@SuppressWarnings("serial")@Singletonpublic class GitPostReceiveCallback extends HttpServlet {@@ -91,7 +90,6 @@ public class GitPostReceiveCallback extends HttpServlet {@Overridepublic void run() {- ThreadContext.bind(User.asSubject(userId));try {Project project = projectManager.load(projectId);@@ -127,12 +125,10 @@ public class GitPostReceiveCallback extends HttpServlet {}} catch (Exception e) {logger.error("Error executing post-receive callback", e);- } finally {- ThreadContext.unbindSubject();- }+ }}- });+ }, User.asSubject(userId));}}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DataManager.javaindex 6efe2eadee..8021ac53a7 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DataManager.java@@ -5,7 +5,7 @@ import java.util.List;import javax.annotation.Nullable;import io.onedev.commons.utils.init.ManualConfig;-import io.onedev.server.model.support.setting.BackupSetting;+import io.onedev.server.model.support.administration.BackupSetting;public interface DataManager {diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex 1ea91d0881..9b751e3c1f 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -38,12 +38,12 @@ import io.onedev.server.event.system.SystemStarting;import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.User;-import io.onedev.server.model.support.AutoDiscoveredJobExecutor;-import io.onedev.server.model.support.setting.BackupSetting;-import io.onedev.server.model.support.setting.GlobalIssueSetting;-import io.onedev.server.model.support.setting.MailSetting;-import io.onedev.server.model.support.setting.SecuritySetting;-import io.onedev.server.model.support.setting.SystemSetting;+import io.onedev.server.model.support.administration.BackupSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.MailSetting;+import io.onedev.server.model.support.administration.SecuritySetting;+import io.onedev.server.model.support.administration.SystemSetting;+import io.onedev.server.model.support.administration.jobexecutor.AutoDiscoveredJobExecutor;import io.onedev.server.notification.MailManager;import io.onedev.server.persistence.IdManager;import io.onedev.server.persistence.PersistManager;@@ -156,6 +156,10 @@ public class DefaultDataManager implements DataManager, Serializable {if (setting == null) {settingManager.saveJobExecutors(Lists.newArrayList(new AutoDiscoveredJobExecutor()));}+ setting = settingManager.getSetting(Key.JOB_SCRIPTS);+ if (setting == null) {+ settingManager.saveGroovyScripts(Lists.newArrayList());+ }setting = settingManager.getSetting(Key.MAIL);if (setting == null) {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 a1e7a547ab..042d17a084 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@@ -3,6 +3,8 @@ package io.onedev.server.model;import java.io.File;import java.io.IOException;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;+import java.lang.reflect.Method;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -42,24 +44,32 @@ import com.google.common.base.Optional;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;+import io.onedev.commons.utils.BeanUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.cache.BuildInfoManager;+import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.VariableInterpolator;import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.ci.job.paramspec.SecretParam;+import io.onedev.server.git.GitUtils;+import io.onedev.server.git.RefInfo;+import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.Input;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.Referenceable;import io.onedev.server.util.facade.BuildFacade;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.annotation.Editable;@Entity@Table(@@ -341,7 +351,7 @@ public class Build extends AbstractEntity implements Referenceable {public void setPullRequestBuilds(Collection<PullRequestBuild> pullRequestBuilds) {this.pullRequestBuilds = pullRequestBuilds;}-+public Map<String, List<String>> getParamMap() {if (paramMap == null) {paramMap = new HashMap<>();@@ -399,7 +409,7 @@ public class Build extends AbstractEntity implements Referenceable {Map<String, Integer> paramOrders = new HashMap<>();int index = 1;- for (InputSpec paramSpec: getJob().getParamSpecs())+ for (ParamSpec paramSpec: getJob().getParamSpecs())paramOrders.put(paramSpec.getName(), index++);Collections.sort(params, new Comparator<BuildParam>() {@@ -435,7 +445,7 @@ public class Build extends AbstractEntity implements Referenceable {public Collection<String> getSecretValuesToMask() {Collection<String> secretValuesToMask = new HashSet<>();for (BuildParam param: getParams()) {- if (param.getType().equals(InputSpec.SECRET) && param.getValue() != null) {+ if (param.getType().equals(ParamSpec.SECRET) && param.getValue() != null) {try {String value = getSecretValue(param.getValue());if (value.length() >= SecretInput.MASK.length())@@ -456,7 +466,7 @@ public class Build extends AbstractEntity implements Referenceable {if (!checkedParamNames.add(paramName))return false;- InputSpec paramSpec = Preconditions.checkNotNull(getJob().getParamSpecMap().get(paramName));+ ParamSpec paramSpec = Preconditions.checkNotNull(getJob().getParamSpecMap().get(paramName));if (paramSpec.getShowCondition() != null) {Input dependentInput = getParamInputs().get(paramSpec.getShowCondition().getInputName());Preconditions.checkNotNull(dependentInput);@@ -474,11 +484,11 @@ public class Build extends AbstractEntity implements Referenceable {}}- public String getSecretValue(String secretKey) {- if (secretKey.startsWith(SecretInput.LITERAL_VALUE_PREFIX))- return secretKey.substring(SecretInput.LITERAL_VALUE_PREFIX.length());+ public String getSecretValue(String secretName) {+ if (secretName.startsWith(SecretParam.LITERAL_VALUE_PREFIX))+ return secretName.substring(SecretParam.LITERAL_VALUE_PREFIX.length());else- return project.getSecretValue(secretKey, ObjectId.fromString(getCommitHash()));+ return project.getSecretValue(secretName, ObjectId.fromString(getCommitHash()));}public CISpec getCISpec() {@@ -503,7 +513,7 @@ public class Build extends AbstractEntity implements Referenceable {BeanDescriptor descriptor = new BeanDescriptor(paramBean.getClass());for (List<PropertyDescriptor> groupProperties: descriptor.getProperties().values()) {for (PropertyDescriptor property: groupProperties) {- InputSpec paramSpec = getJob().getParamSpecMap().get(property.getDisplayName());+ ParamSpec paramSpec = getJob().getParamSpecMap().get(property.getDisplayName());Preconditions.checkNotNull(paramSpec);Input input = Preconditions.checkNotNull(getParamInputs().get(paramSpec.getName()));property.setPropertyValue(paramBean, paramSpec.convertToObject(input.getValues()));@@ -577,6 +587,61 @@ public class Build extends AbstractEntity implements Referenceable {return "build-artifacts:" + getId();}+ public String interpolate(@Nullable String interpolativeString) {+ if (interpolativeString != null)+ return Interpolative.fromString(interpolativeString).interpolateWith(new VariableInterpolator(this));+ else+ return null;+ }++ @SuppressWarnings("unchecked")+ public void interpolate(Serializable bean) {+ try {+ for (Method getter: BeanUtils.findGetters(bean.getClass())) {+ Method setter = BeanUtils.findSetter(getter);+ if (setter != null && getter.getAnnotation(Editable.class) != null) {+ Serializable value = (Serializable) getter.invoke(bean);+ if (value != null) {+ if (getter.getAnnotation(io.onedev.server.web.editable.annotation.Interpolative.class) != null) {+ if (value instanceof String) {+ setter.invoke(bean, interpolate((String) getter.invoke(bean)));+ } else if (value instanceof List) {+ List<String> list = (List<String>) value;+ for (int i=0; i<list.size(); i++)+ list.set(i, interpolate(list.get(i)));+ }+ } else if (value instanceof Collection) {+ for (Serializable element: (Collection<Serializable>) value) {+ if (element.getClass().getAnnotation(Editable.class) != null)+ interpolate(element);+ }+ } else if (value.getClass().getAnnotation(Editable.class) != null) {+ interpolate(value);+ }+ }+ }+ }+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {+ throw new RuntimeException(e);+ }+ }++ public Collection<String> getOnBranches() {+ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);+ Collection<ObjectId> descendants = commitInfoManager.getDescendants(+ getProject(), Sets.newHashSet(getCommitId()));+ descendants.add(getCommitId());++ Collection<String> branches = new ArrayList<>();+ for (RefInfo ref: getProject().getBranches()) {+ String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getRef().getName()));+ if (descendants.contains(ref.getPeeledObj()))+ branches.add(branchName);+ }++ return branches;+ }+public static String getLogWebSocketObservable(Long buildId) {return "build-log:" + buildId;}diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex c2ce32eb9e..8e851d9ae0 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -42,13 +42,13 @@ import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.cache.UserInfoManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.EntityWatch;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.storage.AttachmentStorageSupport;import io.onedev.server.util.Input;import io.onedev.server.util.Referenceable;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.IssueFacade;-import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;@@ -325,7 +325,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt}fieldsOfName.add(field);}- for (InputSpec fieldSpec: getIssueSetting().getFieldSpecs()) {+ for (FieldSpec fieldSpec: getIssueSetting().getFieldSpecs()) {String fieldName = fieldSpec.getName();List<IssueField> fields = fieldMap.get(fieldName);if (fields != null) {@@ -369,7 +369,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStpublic long getFieldOrdinal(String fieldName, Object fieldValue) {GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- InputSpec fieldSpec = issueSetting.getFieldSpec(fieldName);+ FieldSpec fieldSpec = issueSetting.getFieldSpec(fieldName);if (fieldSpec != null)return fieldSpec.getOrdinal(fieldValue);else@@ -384,7 +384,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStfor (PropertyDescriptor property: groupProperties) {Input input = getFieldInputs().get(property.getDisplayName());if (input != null) {- InputSpec fieldSpec = getIssueSetting().getFieldSpec(input.getName());+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(input.getName());property.setPropertyValue(fieldBean, input.getTypedValue(fieldSpec));} else if (!withDefaultValue) {property.setPropertyValue(fieldBean, null);@@ -412,7 +412,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStit.remove();}- InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);if (fieldSpec != null) {long ordinal = getFieldOrdinal(fieldName, fieldValue);@@ -446,7 +446,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStif (!checkedFieldNames.add(fieldName))return false;- InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);if (fieldSpec != null) {if (fieldSpec.getShowCondition() != null) {Input dependentInput = getFieldInputs().get(fieldSpec.getShowCondition().getInputName());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 cfaef6a069..43e50b250b 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@@ -14,6 +14,7 @@ import java.util.Iterator;import java.util.List;import java.util.Map;import java.util.Set;+import java.util.Stack;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.atomic.AtomicReference;import java.util.concurrent.locks.ReadWriteLock;@@ -31,13 +32,9 @@ import javax.persistence.ManyToOne;import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.Version;-import javax.validation.ConstraintValidatorContext;import javax.validation.Valid;-import javax.validation.ValidationException;import org.apache.commons.lang3.SerializationUtils;-import org.apache.shiro.subject.Subject;-import org.apache.shiro.util.ThreadContext;import org.eclipse.jgit.api.CreateBranchCommand;import org.eclipse.jgit.api.Git;import org.eclipse.jgit.api.TagCommand;@@ -107,6 +104,7 @@ import io.onedev.server.git.exception.NotFileException;import io.onedev.server.git.exception.ObjectNotFoundException;import io.onedev.server.model.Build.Status;import io.onedev.server.model.support.BranchProtection;+import io.onedev.server.model.support.BuildSetting;import io.onedev.server.model.support.CommitMessageTransform;import io.onedev.server.model.support.NamedBuildQuery;import io.onedev.server.model.support.NamedCodeCommentQuery;@@ -114,32 +112,31 @@ import io.onedev.server.model.support.NamedCommitQuery;import io.onedev.server.model.support.Secret;import io.onedev.server.model.support.TagProtection;import io.onedev.server.model.support.WebHook;-import io.onedev.server.model.support.build.BuildSetting;import io.onedev.server.model.support.issue.IssueSetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.security.permission.DefaultPrivilege;import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.usermatcher.UserMatcher;-import io.onedev.server.util.validation.Validatable;-import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.util.validation.annotation.ProjectName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Markdown;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.util.ProjectAware;+import io.onedev.server.web.util.WicketUtils;@Entity@Table(indexes={@Index(columnList="o_forkedFrom_id"), @Index(columnList="name")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@DynamicUpdate-@ClassValidating@Editable-public class Project extends AbstractEntity implements Validatable {+public class Project extends AbstractEntity {private static final long serialVersionUID = 1L;@@ -147,6 +144,23 @@ public class Project extends AbstractEntity implements Validatable {public static final int MAX_UPLOAD_SIZE = 10; // In mega bytes+ static ThreadLocal<Stack<Project>> stack = new ThreadLocal<Stack<Project>>() {++ @Override+ protected Stack<Project> initialValue() {+ return new Stack<Project>();+ }++ };++ public static void push(Project project) {+ stack.get().push(project);+ }++ public static void pop() {+ stack.get().pop();+ }+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=true)private Project forkedFrom;@@ -334,8 +348,6 @@ public class Project extends AbstractEntity implements Validatable {private transient List<Milestone> sortedMilestones;- private transient Map<String, Secret> secretMap;-@Editable(order=100)@ProjectName@NotEmpty@@ -925,7 +937,6 @@ public class Project extends AbstractEntity implements Validatable {String refName = GitUtils.branch2ref(branchName);cacheObjectId(refName, commit);- Subject subject = SecurityUtils.getSubject();ObjectId commitId = commit.copy();OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {@@ -935,17 +946,12 @@ public class Project extends AbstractEntity implements Validatable {@Overridepublic void run() {- ThreadContext.bind(subject);- try {- Project project = OneDev.getInstance(ProjectManager.class).load(getId());- OneDev.getInstance(ListenerRegistry.class).post(- new RefUpdated(project, refName, ObjectId.zeroId(), commitId));- } finally {- ThreadContext.unbindSubject();- }+ Project project = OneDev.getInstance(ProjectManager.class).load(getId());+ OneDev.getInstance(ListenerRegistry.class).post(+ new RefUpdated(project, refName, ObjectId.zeroId(), commitId));}- });+ }, SecurityUtils.getSubject());}});@@ -967,7 +973,6 @@ public class Project extends AbstractEntity implements Validatable {String refName = GitUtils.tag2ref(tagName);cacheObjectId(refName, tag.getObjectId());- Subject subject = SecurityUtils.getSubject();ObjectId commitId = tag.getObjectId().copy();OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {@@ -977,17 +982,12 @@ public class Project extends AbstractEntity implements Validatable {@Overridepublic void run() {- ThreadContext.bind(subject);- try {- Project project = OneDev.getInstance(ProjectManager.class).load(getId());- OneDev.getInstance(ListenerRegistry.class).post(- new RefUpdated(project, refName, ObjectId.zeroId(), commitId));- } finally {- ThreadContext.unbindSubject();- }+ Project project = OneDev.getInstance(ProjectManager.class).load(getId());+ OneDev.getInstance(ListenerRegistry.class).post(+ new RefUpdated(project, refName, ObjectId.zeroId(), commitId));}- });+ }, SecurityUtils.getSubject());}});@@ -1230,15 +1230,6 @@ public class Project extends AbstractEntity implements Validatable {this.secrets = secrets;}- public Map<String, Secret> getSecretMap() {- if (secretMap == null) {- secretMap = new HashMap<>();- for (Secret secret: getSecrets())- secretMap.put(secret.getName(), secret);- }- return secretMap;- }-@Nullablepublic TagProtection getTagProtection(String tagName, User user) {for (TagProtection protection: tagProtections) {@@ -1540,31 +1531,27 @@ public class Project extends AbstractEntity implements Validatable {return false;}- @Override- public boolean isValid(ConstraintValidatorContext context) {- boolean isValid = true;- try {- Secret.validateSecrets(getSecrets());- } catch (ValidationException e) {- isValid = false;- context.buildConstraintViolationWithTemplate(e.getMessage()).addPropertyNode("secrets").addConstraintViolation();+ public String getSecretValue(String secretName, ObjectId commitId) {+ for (Secret secret: getSecrets()) {+ if (secret.getName().equals(secretName) && secret.isAuthorized(this, commitId))+ return secret.getValue();}-- if (!isValid)- context.disableDefaultConstraintViolation();-- return isValid;+ throw new OneException("No authorized secret found: " + secretName);}-- 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();++ @Nullable+ public static Project get() {+ if (!stack.get().isEmpty()) {+ return stack.get().peek();+ } else {+ ComponentContext componentContext = ComponentContext.get();+ if (componentContext != null) {+ ProjectAware projectAware = WicketUtils.findInnermost(componentContext.getComponent(), ProjectAware.class);+ if (projectAware != null)+ return projectAware.getProject();+ }+ return null;+ }}+}diff --git a/server-core/src/main/java/io/onedev/server/model/Setting.java b/server-core/src/main/java/io/onedev/server/model/Setting.javaindex 3b6e7098b4..ecf120ae40 100644--- a/server-core/src/main/java/io/onedev/server/model/Setting.java+++ b/server-core/src/main/java/io/onedev/server/model/Setting.java@@ -23,7 +23,7 @@ public class Setting extends AbstractEntity {private static final long serialVersionUID = 1L;- public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, JOB_EXECUTORS};+ public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, JOB_EXECUTORS, JOB_SCRIPTS};/** Optimistic lock is necessary to ensure database integrity when updatediff --git a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex 428bf93220..db00d04db0 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -11,6 +11,7 @@ import javax.validation.constraints.NotNull;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.match.PathMatcher;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -19,10 +20,11 @@ import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.server.util.usermatcher.Anyone;import io.onedev.server.util.usermatcher.UserMatcher;-import io.onedev.server.web.editable.annotation.BranchPatterns;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;@Editable@Horizontal@@ -55,7 +57,7 @@ public class BranchProtection implements Serializable {}@Editable(order=100, description="Specify space-separated branches to be protected. Use * or ? for wildcard match")- @BranchPatterns+ @Patterns(suggester = "suggestBranches")@NotEmptypublic String getBranches() {return branches;@@ -65,6 +67,11 @@ public class BranchProtection implements Serializable {this.branches = branches;}+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestBranches(String matchWith) {+ return SuggestionUtils.suggestBranches(Project.get(), matchWith);+ }+@Editable(order=150, name="Applicable Users", description="Rule will apply only if the user changing the branch matches criteria specified here")@io.onedev.server.web.editable.annotation.UserMatcher@NotEmpty(message="may not be empty")diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/BuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/BuildSetting.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/model/support/build/BuildSetting.javarename to server-core/src/main/java/io/onedev/server/model/support/BuildSetting.javaindex 5819619507..7edf7f446e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/BuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BuildSetting.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.build;+package io.onedev.server.model.support;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/CommitMessageTransform.java b/server-core/src/main/java/io/onedev/server/model/support/CommitMessageTransform.javaindex f58905aa09..7bd95cbb9d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/CommitMessageTransform.java+++ b/server-core/src/main/java/io/onedev/server/model/support/CommitMessageTransform.java@@ -4,7 +4,7 @@ import java.io.Serializable;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.util.validation.annotation.Pattern;+import io.onedev.server.util.validation.annotation.JavaPattern;import io.onedev.server.web.editable.annotation.Editable;@Editable@@ -18,7 +18,7 @@ public class CommitMessageTransform implements Serializable {@Editable(order=100)@NotEmpty- @Pattern+ @JavaPatternpublic String getSearchFor() {return searchFor;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.javaindex 6306e37124..5f13be509e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java@@ -6,7 +6,7 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.server.util.OneContext;+import io.onedev.server.model.Project;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -21,7 +21,7 @@ public class FileProtection implements Serializable {private String reviewRequirement;@Editable(order=100, description="Specify space-separated paths to be protected. Use * or ? for wildcard match")- @Patterns("getPathSuggestions")+ @Patterns(suggester = "getPathSuggestions")@NotEmptypublic String getPaths() {return paths;@@ -33,7 +33,7 @@ public class FileProtection implements Serializable {@SuppressWarnings("unused")private static List<InputSuggestion> getPathSuggestions(String matchWith) {- return SuggestionUtils.suggestBlobs(OneContext.get().getProject(), matchWith);+ return SuggestionUtils.suggestBlobs(Project.get(), matchWith);}@Editable(order=200, name="Reviewers", description="Specify required reviewers if specified path is "diff --git a/server-core/src/main/java/io/onedev/server/model/support/Secret.java b/server-core/src/main/java/io/onedev/server/model/support/Secret.javaindex b9d6db0a1f..e43515459a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/Secret.java+++ b/server-core/src/main/java/io/onedev/server/model/support/Secret.java@@ -1,18 +1,19 @@package io.onedev.server.model.support;import java.io.Serializable;-import java.util.HashSet;import java.util.List;-import java.util.Set;--import javax.validation.ValidationException;+import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.web.editable.annotation.BranchPatterns;+import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.model.Project;+import io.onedev.server.util.validation.annotation.DnsName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Password;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;@Editablepublic class Secret implements Serializable {@@ -20,13 +21,16 @@ public class Secret implements Serializable {private static final long serialVersionUID = 1L;private String name;++ private String description;private String value;- private String branches;-+ private String authorizedBranches;+@Editable(order=100)@NotEmpty+ @DnsNamepublic String getName() {return name;}@@ -35,6 +39,15 @@ public class Secret implements Serializable {this.name = name;}+ @Editable(order=150)+ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }+@Editable(order=200)@Password@NotEmpty@@ -46,26 +59,27 @@ public class Secret implements Serializable {this.value = value;}- @Editable(order=300, name="Trusted Branches", description=""- + "Optionally specify space-separated branches to trust.\n"- + "Only builds from trusted branches can access this secret.\n"- + "Use * or ? for wildcard match. Leave empty to trust all branches")- @BranchPatterns+ @Editable(order=300, name="Authorize Branches", description=""+ + "Optionally specify space-separated branches to authorize.\n"+ + "Only builds from authorized branches can access this secret.\n"+ + "Use * or ? for wildcard match. Leave empty to authorize all branches")+ @Patterns(suggester = "suggestBranches")@NameOfEmptyValue("All")- public String getBranches() {- return branches;+ public String getAuthorizedBranches() {+ return authorizedBranches;}- public void setBranches(String branches) {- this.branches = branches;+ public void setAuthorizedBranches(String authorizedBranches) {+ this.authorizedBranches = authorizedBranches;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestBranches(String matchWith) {+ return SuggestionUtils.suggestBranches(Project.get(), matchWith);}- public static void validateSecrets(List<Secret> secrets) {- Set<String> encounteredSecrets = new HashSet<>();- for (Secret secret: secrets) {- if (!encounteredSecrets.add(secret.getName()))- throw new ValidationException("Duplicate secrets defined: " + secret.getName());- }+ public boolean isAuthorized(Project project, ObjectId commitId) {+ return authorizedBranches == null || project.isCommitOnBranches(commitId, authorizedBranches);}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.javaindex ded739e96c..c63b60e942 100644--- a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java@@ -1,16 +1,20 @@package io.onedev.server.model.support;import java.io.Serializable;+import java.util.List;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.model.Project;import io.onedev.server.util.Usage;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.usermatcher.Anyone;import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;-import io.onedev.server.web.editable.annotation.TagPatterns;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;@Editable@Horizontal@@ -39,7 +43,7 @@ public class TagProtection implements Serializable {}@Editable(order=100, description="Specify space-separated tags to be protected. Use * or ? for wildcard match")- @TagPatterns+ @Patterns(suggester = "suggestTags")@NotEmptypublic String getTags() {return tags;@@ -49,6 +53,11 @@ public class TagProtection implements Serializable {this.tags = tags;}+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestTags(String matchWith) {+ return SuggestionUtils.suggestTags(Project.get(), matchWith);+ }+@Editable(order=150, name="Applicable Users", description="Rule will apply only if the user changing the tag matches criteria specified here")@io.onedev.server.web.editable.annotation.UserMatcher@NotEmpty(message="may not be empty")diff --git a/server-core/src/main/java/io/onedev/server/model/support/setting/BackupSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/BackupSetting.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/model/support/setting/BackupSetting.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/BackupSetting.javaindex e1a196a54a..3d489f48b7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/setting/BackupSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/BackupSetting.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.setting;+package io.onedev.server.model.support.administration;import java.io.Serializable;import java.text.ParseException;diff --git a/server-core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex b15cdc0dcf..7bb5d9ad52 100644--- a/server-core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.setting;+package io.onedev.server.model.support.administration;import java.io.Serializable;import java.util.ArrayList;@@ -17,10 +17,19 @@ import com.google.common.collect.Lists;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneException;+import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;+import io.onedev.server.model.support.inputspec.showcondition.ValueIsOneOf;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.issue.TransitionSpec;+import io.onedev.server.model.support.issue.fieldspec.ChoiceField;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.fieldspec.IssueChoiceField;+import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;@@ -29,15 +38,6 @@ import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.IssueChoiceInput;-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;-import io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;-import io.onedev.server.util.inputspec.showcondition.ShowCondition;-import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;-import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.util.usermatcher.CodeWriters;import io.onedev.server.web.editable.annotation.Editable;@@ -50,7 +50,7 @@ public class GlobalIssueSetting implements Serializable {private List<TransitionSpec> defaultTransitionSpecs = new ArrayList<>();- private List<InputSpec> fieldSpecs = new ArrayList<>();+ private List<FieldSpec> fieldSpecs = new ArrayList<>();private Set<String> defaultPromptFieldsUponIssueOpen = new HashSet<>();@@ -63,7 +63,7 @@ public class GlobalIssueSetting implements Serializable {private boolean reconciled = true;public GlobalIssueSetting() {- ChoiceInput type = new ChoiceInput();+ ChoiceField type = new ChoiceField();type.setName("Type");SpecifiedChoices specifiedChoices = new SpecifiedChoices();@@ -93,7 +93,7 @@ public class GlobalIssueSetting implements Serializable {fieldSpecs.add(type);- ChoiceInput priority = new ChoiceInput();+ ChoiceField priority = new ChoiceField();priority.setName("Priority");specifiedChoices = new SpecifiedChoices();@@ -128,8 +128,8 @@ public class GlobalIssueSetting implements Serializable {fieldSpecs.add(priority);- UserChoiceInput assignee = new UserChoiceInput();- assignee.setChoiceProvider(new io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.CodeWriters());+ UserChoiceField assignee = new UserChoiceField();+ assignee.setChoiceProvider(new io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.CodeWriters());assignee.setCanBeChangedBy(new CodeWriters().toString());assignee.setAllowEmpty(true);assignee.setNameOfEmptyValue("Not assigned");@@ -137,7 +137,7 @@ public class GlobalIssueSetting implements Serializable {fieldSpecs.add(assignee);- ChoiceInput resolution = new ChoiceInput();+ ChoiceField resolution = new ChoiceField();resolution.setName("Resolution");specifiedChoices = new SpecifiedChoices();@@ -164,7 +164,7 @@ public class GlobalIssueSetting implements Serializable {fieldSpecs.add(resolution);- IssueChoiceInput duplicateWith = new IssueChoiceInput();+ IssueChoiceField duplicateWith = new IssueChoiceField();duplicateWith.setName("Duplicate With");ShowCondition showCondition = new ShowCondition();@@ -270,11 +270,11 @@ public class GlobalIssueSetting implements Serializable {}@Editable- public List<InputSpec> getFieldSpecs() {+ public List<FieldSpec> getFieldSpecs() {return fieldSpecs;}- public void setFieldSpecs(List<InputSpec> fieldSpecs) {+ public void setFieldSpecs(List<FieldSpec> fieldSpecs) {this.fieldSpecs = fieldSpecs;}@@ -294,10 +294,10 @@ public class GlobalIssueSetting implements Serializable {this.reconciled = reconciled;}- private Map<String, InputSpec> getFieldSpecMap() {+ private Map<String, FieldSpec> getFieldSpecMap() {// Do not use cache here as we may change fieldSpecs while editing IssueSetting- Map<String, InputSpec> fieldSpecMap = new LinkedHashMap<>();- for (InputSpec field: getFieldSpecs())+ Map<String, FieldSpec> fieldSpecMap = new LinkedHashMap<>();+ for (FieldSpec field: getFieldSpecs())fieldSpecMap.put(field.getName(), field);return fieldSpecMap;}@@ -358,7 +358,7 @@ public class GlobalIssueSetting implements Serializable {}@Nullable- public InputSpec getFieldSpec(String fieldName) {+ public FieldSpec getFieldSpec(String fieldName) {return getFieldSpecMap().get(fieldName);}@@ -385,8 +385,8 @@ public class GlobalIssueSetting implements Serializable {}}Set<String> deletedFields = new HashSet<>();- for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {- InputSpec field = it.next();+ for (Iterator<FieldSpec> it = getFieldSpecs().iterator(); it.hasNext();) {+ FieldSpec field = it.next();if (field.onEditInputValues(fieldName, valueSetEdit)) {it.remove();deletedFields.add(field.getName());@@ -399,7 +399,7 @@ public class GlobalIssueSetting implements Serializable {public void onRenameField(String oldName, String newName) {for (TransitionSpec transition: getDefaultTransitionSpecs())transition.onRenameField(oldName, newName);- for (InputSpec field: getFieldSpecs())+ for (FieldSpec field: getFieldSpecs())field.onRenameInput(oldName, newName);for (BoardSpec board: getDefaultBoardSpecs())board.onRenameField(this, oldName, newName);@@ -436,14 +436,14 @@ public class GlobalIssueSetting implements Serializable {}}- for (InputSpec field: getFieldSpecs())+ for (FieldSpec field: getFieldSpecs())field.onDeleteInput(fieldName);}public void onRenameUser(String oldName, String newName) {for (TransitionSpec transition: getDefaultTransitionSpecs())transition.onRenameUser(oldName, newName);- for (InputSpec field: getFieldSpecs())+ for (FieldSpec field: getFieldSpecs())field.onRenameUser(oldName, newName);for (BoardSpec board: getDefaultBoardSpecs())board.onRenameUser(this, oldName, newName);@@ -460,7 +460,7 @@ public class GlobalIssueSetting implements Serializable {elseit.remove();}- for (InputSpec field: getFieldSpecs())+ for (FieldSpec field: getFieldSpecs())usage.add(field.onDeleteUser(userName));return usage.prefix("issue setting");@@ -469,7 +469,7 @@ public class GlobalIssueSetting implements Serializable {public void onRenameGroup(String oldName, String newName) {for (TransitionSpec transition: getDefaultTransitionSpecs())transition.onRenameGroup(oldName, newName);- for (InputSpec field: getFieldSpecs())+ for (FieldSpec field: getFieldSpecs())field.onRenameGroup(oldName, newName);}@@ -478,7 +478,7 @@ public class GlobalIssueSetting implements Serializable {for (TransitionSpec transition: getDefaultTransitionSpecs())usage.add(transition.onDeleteGroup(groupName));- for (InputSpec field: getFieldSpecs())+ for (FieldSpec field: getFieldSpecs())usage.add(field.onDeleteGroup(groupName));return usage.prefix("issue setting");diff --git a/server-core/src/main/java/io/onedev/server/model/support/setting/MailSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/model/support/setting/MailSetting.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.javaindex 16c649d014..e615ab3cb9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/setting/MailSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.setting;+package io.onedev.server.model.support.administration;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/setting/SecuritySetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/model/support/setting/SecuritySetting.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.javaindex 2d71f1c9b2..a939b55027 100644--- a/server-core/src/main/java/io/onedev/server/model/support/setting/SecuritySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.setting;+package io.onedev.server.model.support.administration;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.javaindex 990fd91ab2..bdb1e9d52e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.setting;+package io.onedev.server.model.support.administration;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/authenticator/Authenticated.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/model/support/authenticator/Authenticated.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.javaindex 0e3b9566e6..5317be2c9b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/authenticator/Authenticated.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.authenticator;+package io.onedev.server.model.support.administration.authenticator;import java.util.Collection;diff --git a/server-core/src/main/java/io/onedev/server/model/support/authenticator/Authenticator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/model/support/authenticator/Authenticator.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.javaindex 8053628c96..4b9f3a1e99 100644--- a/server-core/src/main/java/io/onedev/server/model/support/authenticator/Authenticator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticator.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.authenticator;+package io.onedev.server.model.support.administration.authenticator;import java.io.Serializable;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/ActiveDirectoryAuthenticator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/ActiveDirectoryAuthenticator.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/ActiveDirectoryAuthenticator.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/ActiveDirectoryAuthenticator.javaindex 8f906df5b9..c6d913a8ba 100644--- a/server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/ActiveDirectoryAuthenticator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/ActiveDirectoryAuthenticator.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.authenticator.ldap;+package io.onedev.server.model.support.administration.authenticator.ldap;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/DoNotRetrieveGroups.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/DoNotRetrieveGroups.javasimilarity index 72%rename from server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/DoNotRetrieveGroups.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/DoNotRetrieveGroups.javaindex e5545b1155..bb6c5dee63 100644--- a/server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/DoNotRetrieveGroups.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/DoNotRetrieveGroups.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.authenticator.ldap;+package io.onedev.server.model.support.administration.authenticator.ldap;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/GetGroupsUsingAttribute.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/GetGroupsUsingAttribute.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/GetGroupsUsingAttribute.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/GetGroupsUsingAttribute.javaindex d7719fab67..66e6a1c9a2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/GetGroupsUsingAttribute.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/GetGroupsUsingAttribute.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.authenticator.ldap;+package io.onedev.server.model.support.administration.authenticator.ldap;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/GroupRetrieval.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/GroupRetrieval.javasimilarity index 68%rename from server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/GroupRetrieval.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/GroupRetrieval.javaindex ecebd4263f..23df96f847 100644--- a/server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/GroupRetrieval.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/GroupRetrieval.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.authenticator.ldap;+package io.onedev.server.model.support.administration.authenticator.ldap;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/LdapAuthenticator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/LdapAuthenticator.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.javaindex f0dc6508c8..3a03c5eefc 100644--- a/server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/LdapAuthenticator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.authenticator.ldap;+package io.onedev.server.model.support.administration.authenticator.ldap;import java.util.ArrayList;import java.util.Collection;@@ -29,8 +29,8 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.model.support.authenticator.Authenticated;-import io.onedev.server.model.support.authenticator.Authenticator;+import io.onedev.server.model.support.administration.authenticator.Authenticated;+import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Password;diff --git a/server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/SearchGroupsUsingFilter.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/SearchGroupsUsingFilter.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/SearchGroupsUsingFilter.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/SearchGroupsUsingFilter.javaindex c3d7a95b24..2b82422d8b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/authenticator/ldap/SearchGroupsUsingFilter.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/SearchGroupsUsingFilter.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.authenticator.ldap;+package io.onedev.server.model.support.administration.authenticator.ldap;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/GroovyScript.javanew file mode 100644index 0000000000..2814152144--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/GroovyScript.java@@ -0,0 +1,89 @@+package io.onedev.server.model.support.administration.groovyscript;++import java.io.Serializable;+import java.util.List;++import javax.validation.constraints.Size;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.Usage;+import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.scriptidentity.SiteAdministrator;+import io.onedev.server.util.validation.annotation.DnsName;+import io.onedev.server.web.editable.annotation.Code;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;++@Editable+public class GroovyScript implements Serializable {++ private static final long serialVersionUID = 1L;++ private String name;++ private String description;++ private List<String> content;++ private JobAuthorization jobAuthorization = new JobAuthorization();++ @Editable(order=100)+ @DnsName+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=200)+ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }++ @Editable(order=300)+ @Code(language = Code.GROOVY)+ @Size(min=1, message="May not be empty")+ public List<String> getContent() {+ return content;+ }++ public void setContent(List<String> content) {+ this.content = content;+ }++ @Editable(order=400, name="Can be Used by Jobs")+ @NameOfEmptyValue("No")+ public JobAuthorization getJobAuthorization() {+ return jobAuthorization;+ }++ public void setJobAuthorization(JobAuthorization jobAuthorization) {+ this.jobAuthorization = jobAuthorization;+ }++ public final boolean isAuthorized(ScriptIdentity identity) {+ return identity instanceof SiteAdministrator+ || jobAuthorization != null && jobAuthorization.isAuthorized(identity);+ }++ public Usage onDeleteProject(String projectName, int index) {+ Usage usage = new Usage();+ if (jobAuthorization != null)+ usage = jobAuthorization.onDeleteProject(projectName);+ return usage.prefix("groovy script #" + index);+ }++ public void onRenameProject(String oldName, String newName) {+ if (jobAuthorization != null)+ jobAuthorization.onRenameProject(oldName, newName);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/JobAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/JobAuthorization.javanew file mode 100644index 0000000000..27e657b1f1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/JobAuthorization.java@@ -0,0 +1,88 @@+package io.onedev.server.model.support.administration.groovyscript;++import java.util.List;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.utils.match.Matcher;+import io.onedev.commons.utils.match.PathMatcher;+import io.onedev.server.util.Usage;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.util.scriptidentity.JobIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;++@Editable+public class JobAuthorization implements ScriptAuthorization {++ private static final long serialVersionUID = 1L;++ private String allowedProjects;++ private String allowedBranches;++ @Editable(order=400, description="Optionally specify space-separated projects allowed to "+ + "execute this script. Use * or ? for wildcard match. Leave empty to allow all")+ @Patterns(suggester = "suggestProjects")+ @NameOfEmptyValue("All")+ public String getAllowedProjects() {+ return allowedProjects;+ }++ public void setAllowedProjects(String allowedProjects) {+ this.allowedProjects = allowedProjects;+ }++ @Editable(order=500, description="Optionally specify space-separated branches allowed to "+ + "execute this script. Use * or ? for wildcard match. Leave empty to allow all")+ @Patterns+ @NameOfEmptyValue("All")+ public String getAllowedBranches() {+ return allowedBranches;+ }++ public void setAllowedBranches(String allowedBranches) {+ this.allowedBranches = allowedBranches;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestProjects(String matchWith) {+ return SuggestionUtils.suggestProjects(matchWith);+ }++ @Override+ public boolean isAuthorized(ScriptIdentity identity) {+ if (identity instanceof JobIdentity) {+ JobIdentity jobIdentity = (JobIdentity) identity;+ Matcher matcher = new PathMatcher();+ return (getAllowedProjects() == null || PatternSet.fromString(getAllowedProjects()).matches(matcher, jobIdentity.getProject().getName()))+ && (getAllowedBranches() == null || jobIdentity.getProject().isCommitOnBranches(jobIdentity.getCommitId(), getAllowedBranches()));+ } else {+ return false;+ }+ }++ public Usage onDeleteProject(String projectName) {+ Usage usage = new Usage();+ if (getAllowedProjects() != null) {+ PatternSet patternSet = PatternSet.fromString(getAllowedProjects());+ if (patternSet.getIncludes().contains(projectName) || patternSet.getExcludes().contains(projectName))+ usage.add("allowed projects");+ }+ return usage.prefix("job authorization");+ }++ public void onRenameProject(String oldName, String newName) {+ PatternSet patternSet = PatternSet.fromString(getAllowedProjects());+ if (patternSet.getIncludes().remove(oldName))+ patternSet.getIncludes().add(newName);+ if (patternSet.getExcludes().remove(oldName))+ patternSet.getExcludes().add(newName);+ setAllowedProjects(patternSet.toString());+ if (getAllowedProjects().length() == 0)+ setAllowedProjects(null);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/ScriptAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/ScriptAuthorization.javanew file mode 100644index 0000000000..8c66b7d3fc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/groovyscript/ScriptAuthorization.java@@ -0,0 +1,11 @@+package io.onedev.server.model.support.administration.groovyscript;++import java.io.Serializable;++import io.onedev.server.util.scriptidentity.ScriptIdentity;++public interface ScriptAuthorization extends Serializable {++ boolean isAuthorized(ScriptIdentity identity);++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.javasimilarity index 83%rename from server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.javaindex 1fc6358982..4f564ff7a5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support;+package io.onedev.server.model.support.administration.jobexecutor;import java.util.ArrayList;import java.util.Comparator;@@ -9,7 +9,6 @@ import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.ci.job.JobContext;import io.onedev.server.ci.job.JobExecutorDiscoverer;-import io.onedev.server.model.support.jobexecutor.JobExecutor;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;@@ -39,12 +38,12 @@ public class AutoDiscoveredJobExecutor extends JobExecutor {});JobExecutor jobExecutor = jobExecutors.iterator().next();- jobExecutor.setBranches(getBranches());+ jobExecutor.setApplicableBranches(getApplicableBranches());jobExecutor.setCacheTTL(getCacheTTL());jobExecutor.setEnabled(isEnabled());- jobExecutor.setJobImages(getJobImages());- jobExecutor.setJobNames(getJobNames());- jobExecutor.setProjects(getProjects());+ jobExecutor.setApplicableJobImages(getApplicableJobImages());+ jobExecutor.setApplicableJobNames(getApplicableJobNames());+ jobExecutor.setApplicableProjects(getApplicableProjects());jobExecutor.execute(jobToken, context);} else {throw new OneException("No job executors discovered");diff --git a/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javasimilarity index 54%rename from server-core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javaindex 421404148a..3194b463b3 100644--- a/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java@@ -1,9 +1,11 @@-package io.onedev.server.model.support.jobexecutor;+package io.onedev.server.model.support.administration.jobexecutor;import java.io.Serializable;+import java.util.List;import org.eclipse.jgit.lib.ObjectId;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.launcher.loader.ExtensionPoint;import io.onedev.commons.utils.match.Matcher;import io.onedev.commons.utils.match.PathMatcher;@@ -11,11 +13,10 @@ import io.onedev.server.ci.job.JobContext;import io.onedev.server.model.Project;import io.onedev.server.util.Usage;import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.web.editable.annotation.BranchPatterns;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;-import io.onedev.server.web.editable.annotation.ProjectPatterns;+import io.onedev.server.web.util.SuggestionUtils;@ExtensionPoint@Editable@@ -25,13 +26,13 @@ public abstract class JobExecutor implements Serializable {private boolean enabled = true;- private String projects;+ private String applicableProjects;- private String branches;+ private String applicableBranches;- private String jobNames;+ private String applicAppAppableJobNames;- private String jobImages;+ private String applicableJobImages;private int cacheTTL = 7;@@ -43,56 +44,61 @@ public abstract class JobExecutor implements Serializable {this.enabled = enabled;}- @Editable(order=10000, name="Applicable Projects", group="Job Applicability",+ @Editable(order=10000, group="Job Applicability",description="Optionally specify space-separated projects applicable for this executor. "+ "Use * or ? for wildcard match. Leave empty to match all")- @ProjectPatterns+ @Patterns(suggester = "suggestProjects")@NameOfEmptyValue("All")- public String getProjects() {- return projects;+ public String getApplicableProjects() {+ return applicableProjects;}- public void setProjects(String projects) {- this.projects = projects;+ public void setApplicableProjects(String applicableProjects) {+ this.applicableProjects = applicableProjects;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestProjects(String matchWith) {+ return SuggestionUtils.suggestProjects(matchWith);}- @Editable(order=10100, name="Applicable Branches", group="Job Applicability",+ @Editable(order=10100, group="Job Applicability",description="Optionally specify space-separated branches applicable for this executor. "+ "Use * or ? for wildcard match. Leave empty to match all")- @BranchPatterns+ @Patterns@NameOfEmptyValue("All")- public String getBranches() {- return branches;+ public String getApplicableBranches() {+ return applicableBranches;}- public void setBranches(String branches) {- this.branches = branches;+ public void setApplicableBranches(String applicableBranches) {+ this.applicableBranches = applicableBranches;}- @Editable(order=10200, name="Applicable Job Names", group="Job Applicability",+ @Editable(order=10200, group="Job Applicability",description="Optionally specify space-separated jobs applicable for this executor. "+ "Use * or ? for wildcard match. Leave empty to match all")@Patterns@NameOfEmptyValue("All")- public String getJobNames() {- return jobNames;+ public String getApplicableJobNames() {+ return applicAppAppableJobNames;}- public void setJobNames(String jobNames) {- this.jobNames = jobNames;+ public void setApplicableJobNames(String applicableJobNames) {+ this.applicAppAppableJobNames = applicableJobNames;}- @Editable(order=10300, name="Applicable Job Images", group="Job Applicability",+ @Editable(order=10300, group="Job Applicability",description="Optionally specify space-separated job images applicable for this executor. "+ "Use * or ? for wildcard match. Leave empty to match all")@Patterns@NameOfEmptyValue("All")- public String getJobImages() {- return jobImages;+ public String getApplicableJobImages() {+ return applicableJobImages;}- public void setJobImages(String jobImages) {- this.jobImages = jobImages;+ public void setApplicableJobImages(String applicableJobImages) {+ this.applicableJobImages = applicableJobImages;}@Editable(order=50000, group="More Settings", description="Specify job cache TTL (time to live) by days. "@@ -109,20 +115,20 @@ public abstract class JobExecutor implements Serializable {public abstract void execute(String jobToken, JobContext context);- public final boolean isApplicable(Project project, ObjectId commitId, String jobName, String jobEnvironment) {+ public final boolean isApplicable(Project project, ObjectId commitId, String jobName, String jobImage) {Matcher matcher = new PathMatcher();return isEnabled()- && (getProjects() == null || PatternSet.fromString(getProjects()).matches(matcher, project.getName()))- && (getJobNames() == null || PatternSet.fromString(getJobNames()).matches(matcher, jobName))- && (getJobImages() == null || PatternSet.fromString(getJobImages()).matches(matcher, jobEnvironment))- && (getBranches() == null || project.isCommitOnBranches(commitId, getBranches()));+ && (getApplicableProjects() == null || PatternSet.fromString(getApplicableProjects()).matches(matcher, project.getName()))+ && (getApplicableJobNames() == null || PatternSet.fromString(getApplicableJobNames()).matches(matcher, jobName))+ && (getApplicableJobImages() == null || PatternSet.fromString(getApplicableJobImages()).matches(matcher, jobImage))+ && (getApplicableBranches() == null || project.isCommitOnBranches(commitId, getApplicableBranches()));}public Usage onDeleteProject(String projectName, int executorIndex) {Usage usage = new Usage();- if (getProjects() != null) {- PatternSet patternSet = PatternSet.fromString(getProjects());+ if (getApplicableProjects() != null) {+ PatternSet patternSet = PatternSet.fromString(getApplicableProjects());if (patternSet.getIncludes().contains(projectName) || patternSet.getExcludes().contains(projectName))usage.add("applicable projects");}@@ -130,14 +136,14 @@ public abstract class JobExecutor implements Serializable {}public void onRenameProject(String oldName, String newName) {- PatternSet patternSet = PatternSet.fromString(getProjects());+ PatternSet patternSet = PatternSet.fromString(getApplicableProjects());if (patternSet.getIncludes().remove(oldName))patternSet.getIncludes().add(newName);if (patternSet.getExcludes().remove(oldName))patternSet.getExcludes().add(newName);- setProjects(patternSet.toString());- if (getProjects().length() == 0)- setProjects(null);+ setApplicableProjects(patternSet.toString());+ if (getApplicableProjects().length() == 0)+ setApplicableProjects(null);}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/NodeSelectorEntry.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/NodeSelectorEntry.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/model/support/jobexecutor/NodeSelectorEntry.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/NodeSelectorEntry.javaindex a7b340050a..0cb4628e69 100644--- a/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/NodeSelectorEntry.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/NodeSelectorEntry.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.jobexecutor;+package io.onedev.server.model.support.administration.jobexecutor;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/ServiceLocator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/model/support/jobexecutor/ServiceLocator.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.javaindex 82aff0bd74..983c1e77e4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/ServiceLocator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.jobexecutor;+package io.onedev.server.model.support.administration.jobexecutor;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.javanew file mode 100755index 0000000000..900d3f54a9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.java@@ -0,0 +1,48 @@+package io.onedev.server.model.support.inputspec;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.ValidationException;++import com.google.common.collect.Lists;++public class BuildChoiceInput {++ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes) {+ int index = indexes.get(inputSpec.getName());+ StringBuffer buffer = new StringBuffer();+ inputSpec.appendField(buffer, index, "Long");+ inputSpec.appendCommonAnnotations(buffer, index);+ if (!inputSpec.isAllowEmpty())+ buffer.append(" @NotNull\n");+ buffer.append(" @BuildChoice\n");+ inputSpec.appendMethods(buffer, index, "Long", null, null);++ return buffer.toString();+ }++ public static Object convertToObject(List<String> strings) {+ if (strings.size() == 0) {+ return null;+ } else if (strings.size() == 1) {+ String value = strings.iterator().next();+ try {+ return Long.valueOf(value);+ } catch (NumberFormatException e) {+ throw new ValidationException("Invalid build number");+ }+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }+ }++ public static List<String> convertToStrings(Object value) {+ if (value instanceof Long)+ return Lists.newArrayList((String) value);+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/CommitInput.javaold mode 100644new mode 100755similarity index 54%rename from server-core/src/main/java/io/onedev/server/util/inputspec/CommitInput.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/CommitInput.javaindex bd4eb9d9b0..a7a4201e17--- a/server-core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/CommitInput.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec;+package io.onedev.server.model.support.inputspec;import java.util.ArrayList;import java.util.List;@@ -10,28 +10,21 @@ import org.eclipse.jgit.lib.ObjectId;import com.google.common.collect.Lists;-import io.onedev.server.web.editable.annotation.Editable;+public class CommitInput {-@Editable(order=1400, name=InputSpec.COMMIT)-public class CommitInput extends InputSpec {-- private static final long serialVersionUID = 1L;-- @Override- public String getPropertyDef(Map<String, Integer> indexes) {- int index = indexes.get(getName());+ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes) {+ int index = indexes.get(inputSpec.getName());StringBuffer buffer = new StringBuffer();- appendField(buffer, index, "String");- appendCommonAnnotations(buffer, index);- if (!isAllowEmpty())+ inputSpec.appendField(buffer, index, "String");+ inputSpec.appendCommonAnnotations(buffer, index);+ if (!inputSpec.isAllowEmpty())buffer.append(" @NotEmpty\n");- appendMethods(buffer, index, "String", null, null);+ inputSpec.appendMethods(buffer, index, "String", null, null);return buffer.toString();}- @Override- public Object convertToObject(List<String> strings) {+ public static Object convertToObject(List<String> strings) {if (strings.size() == 0) {return null;} else if (strings.size() == 1) {@@ -45,8 +38,7 @@ public class CommitInput extends InputSpec {}}- @Override- public List<String> convertToStrings(Object value) {+ public static List<String> convertToStrings(Object value) {if (value instanceof String)return Lists.newArrayList((String) value);elsediff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputContext.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputContext.javanew file mode 100755index 0000000000..5fb8aa1841--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputContext.java@@ -0,0 +1,27 @@+package io.onedev.server.model.support.inputspec;++import java.util.List;++import javax.annotation.Nullable;++import io.onedev.server.util.ComponentContext;+import io.onedev.server.web.util.WicketUtils;++public interface InputContext {++ List<String> getInputNames();++ @Nullable+ InputSpec getInputSpec(String inputName);++ @Nullable+ public static InputContext get() {+ ComponentContext componentContext = ComponentContext.get();+ if (componentContext != null)+ return WicketUtils.findInnermost(componentContext.getComponent(), InputContext.class);+ else+ return null;+ }++}+\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.javasimilarity index 73%rename from server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.javaindex a0648810b1..9a74f6b065 100644--- a/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec;+package io.onedev.server.model.support.inputspec;import java.io.Serializable;import java.util.Collection;@@ -9,27 +9,20 @@ import java.util.Map;import javax.annotation.Nullable;import org.apache.commons.lang.SerializationUtils;-import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.unbescape.java.JavaEscape;import com.google.common.collect.Lists;+import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;+import io.onedev.server.model.support.inputspec.showcondition.ValueIsNotAnyOf;+import io.onedev.server.model.support.inputspec.showcondition.ValueIsOneOf;import io.onedev.server.util.GroovyUtils;-import io.onedev.server.util.OneContext;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.util.inputspec.showcondition.ShowCondition;-import io.onedev.server.util.inputspec.showcondition.ValueIsNotAnyOf;-import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;-import io.onedev.server.util.usermatcher.Anyone;-import io.onedev.server.util.validation.annotation.InputName;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Multiline;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.UserMatcher;@Editablepublic abstract class InputSpec implements Serializable {@@ -70,15 +63,8 @@ public abstract class InputSpec implements Serializable {private boolean allowEmpty;- private String nameOfEmptyValue;-private ShowCondition showCondition;- private String canBeChangedBy = new Anyone().toString();-- @Editable(order=10)- @InputName- @NotEmptypublic String getName() {return name;}@@ -87,9 +73,6 @@ public abstract class InputSpec implements Serializable {this.name = name;}- @Editable(order=30, description="resource.input.description")- @NameOfEmptyValue("No description")- @Multilinepublic String getDescription() {return description;}@@ -98,7 +81,6 @@ public abstract class InputSpec implements Serializable {this.description = description;}- @Editable(order=35, description="resource.input.allowMultiple")public boolean isAllowMultiple() {return allowMultiple;}@@ -107,8 +89,6 @@ public abstract class InputSpec implements Serializable {this.allowMultiple = allowMultiple;}- @Editable(order=40, name="Show Conditionally", description="resource.input.showCondition")- @NameOfEmptyValue("Always")public ShowCondition getShowCondition() {return showCondition;}@@ -117,7 +97,6 @@ public abstract class InputSpec implements Serializable {this.showCondition = showCondition;}- @Editable(order=50, name="Allow Empty Value", description="resource.input.allowEmpty")public boolean isAllowEmpty() {return allowEmpty;}@@ -126,33 +105,6 @@ public abstract class InputSpec implements Serializable {this.allowEmpty = allowEmpty;}- @Editable(order=60)- @io.onedev.server.web.editable.annotation.ShowCondition("isNameOfEmptyValueVisible")- @NotEmpty- public String getNameOfEmptyValue() {- return nameOfEmptyValue;- }-- public void setNameOfEmptyValue(String nameOfEmptyValue) {- this.nameOfEmptyValue = nameOfEmptyValue;- }-- @Editable(order=65, description="resource.input.canBeChangedBy")- @UserMatcher- @NotEmpty- public String getCanBeChangedBy() {- return canBeChangedBy;- }-- public void setCanBeChangedBy(String canBeChangedBy) {- this.canBeChangedBy = canBeChangedBy;- }-- @SuppressWarnings("unused")- private static boolean isNameOfEmptyValueVisible() {- return (boolean) OneContext.get().getEditContext().getInputValue("allowEmpty");- }-public List<String> getPossibleValues() {return Lists.newArrayList();}@@ -176,16 +128,16 @@ public abstract class InputSpec implements Serializable {return buffer.toString();}- protected void appendField(StringBuffer buffer, int index, String type) {+ public void appendField(StringBuffer buffer, int index, String type) {buffer.append(" private Optional<" + type + "> input" + index + ";\n");buffer.append("\n");}- protected void appendChoiceProvider(StringBuffer buffer, int index, String annotation) {+ public void appendChoiceProvider(StringBuffer buffer, int index, String annotation) {buffer.append(" " + annotation + "(\"getInput" + index + "Choices\")\n");}- protected void appendCommonAnnotations(StringBuffer buffer, int index) {+ public void appendCommonAnnotations(StringBuffer buffer, int index) {if (description != null) {buffer.append(" @Editable(name=\"" + escape(name) + "\", description=\"" +escape(description) + "\", order=" + index + ")\n");@@ -195,20 +147,18 @@ public abstract class InputSpec implements Serializable {}if (showCondition != null)buffer.append(" @ShowCondition(\"isInput" + index + "Visible\")\n");- if (getNameOfEmptyValue() != null)- buffer.append(" @NameOfEmptyValue(\"" + escape(getNameOfEmptyValue()) + "\")");}- private void wrapWithPropertyContext(StringBuffer buffer, int index, String statement) {- buffer.append(" OneContext context = OneContext.get();\n");+ private void wrapWithChildContext(StringBuffer buffer, int index, String statement) {+ buffer.append(" ComponentContext context = ComponentContext.get();\n");buffer.append(" if (context != null) {\n");- buffer.append(" OneContext propertyContext = context.getPropertyContext(\"input" + index + "\");\n");- buffer.append(" if (propertyContext != null) {\n");- buffer.append(" OneContext.push(propertyContext);\n");+ buffer.append(" ComponentContext childContext = context.getChildContext(\"input" + index + "\");\n");+ buffer.append(" if (childContext != null) {\n");+ buffer.append(" ComponentContext.push(childContext);\n");buffer.append(" try {\n");buffer.append(" " + statement + "\n");buffer.append(" } finally {\n");- buffer.append(" OneContext.pop();\n");+ buffer.append(" ComponentContext.pop();\n");buffer.append(" }\n");buffer.append(" } else {\n");buffer.append(" " + statement + "\n");@@ -218,7 +168,7 @@ public abstract class InputSpec implements Serializable {buffer.append(" }\n");}- protected void appendMethods(StringBuffer buffer, int index, String type,+ public void appendMethods(StringBuffer buffer, int index, String type,@Nullable Serializable choiceProvider, @Nullable Serializable defaultValueProvider) {String literalBytes = getLiteral(SerializationUtils.serialize(defaultValueProvider));buffer.append(" public " + type + " getInput" + index + "() {\n");@@ -226,7 +176,7 @@ public abstract class InputSpec implements Serializable {buffer.append(" return input" + index + ".orNull();\n");buffer.append(" } else {\n");if (defaultValueProvider != null) {- wrapWithPropertyContext(buffer, index, "return SerializationUtils.deserialize(" + literalBytes + ").getDefaultValue();");+ wrapWithChildContext(buffer, index, "return SerializationUtils.deserialize(" + literalBytes + ").getDefaultValue();");} else {buffer.append(" return null;\n");}@@ -250,7 +200,7 @@ public abstract class InputSpec implements Serializable {if (choiceProvider != null) {buffer.append(" private static List getInput" + index + "Choices() {\n");literalBytes = getLiteral(SerializationUtils.serialize(choiceProvider));- if (choiceProvider instanceof io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider) {+ if (choiceProvider instanceof io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider) {buffer.append(" return new ArrayList(SerializationUtils.deserialize(" + literalBytes + ").getChoices(false).keySet());\n");} else {buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").getChoices(false);\n");@@ -272,7 +222,7 @@ public abstract class InputSpec implements Serializable {showCondition = null;}- public static Class<?> defineClass(String className, String description, Collection<InputSpec> inputs) {+ public static Class<?> defineClass(String className, String description, Collection<? extends InputSpec> inputs) {StringBuffer buffer = new StringBuffer();buffer.append("import org.apache.commons.lang3.SerializationUtils;\n");buffer.append("import com.google.common.base.Optional;\n");@@ -376,7 +326,7 @@ public abstract class InputSpec implements Serializable {return false;}- protected boolean checkListElements(Object value, Class<?> elementClass) {+ public boolean checkListElements(Object value, Class<?> elementClass) {if (value instanceof List) {for (Object element: (List<?>)value) {if (element == null || element.getClass() != elementClass)@@ -387,5 +337,5 @@ public abstract class InputSpec implements Serializable {return false;}}-+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.javanew file mode 100755index 0000000000..a887f2630b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.java@@ -0,0 +1,48 @@+package io.onedev.server.model.support.inputspec;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.ValidationException;++import com.google.common.collect.Lists;++public class IssueChoiceInput {++ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes) {+ int index = indexes.get(inputSpec.getName());+ StringBuffer buffer = new StringBuffer();+ inputSpec.appendField(buffer, index, "Long");+ inputSpec.appendCommonAnnotations(buffer, index);+ if (!inputSpec.isAllowEmpty())+ buffer.append(" @NotNull\n");+ buffer.append(" @IssueChoice\n");+ inputSpec.appendMethods(buffer, index, "Long", null, null);++ return buffer.toString();+ }++ public static Object convertToObject(List<String> strings) {+ if (strings.size() == 0) {+ return null;+ } else if (strings.size() == 1) {+ String value = strings.iterator().next();+ try {+ return Long.valueOf(value);+ } catch (NumberFormatException e) {+ throw new ValidationException("Invalid issue number");+ }+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }+ }++ public static List<String> convertToStrings(Object value) {+ if (value instanceof Long)+ return Lists.newArrayList((String) value);+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.javanew file mode 100755index 0000000000..0d8f6e3473--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.java@@ -0,0 +1,48 @@+package io.onedev.server.model.support.inputspec;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.ValidationException;++import com.google.common.collect.Lists;++public class PullRequestChoiceInput {++ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes) {+ int index = indexes.get(inputSpec.getName());+ StringBuffer buffer = new StringBuffer();+ inputSpec.appendField(buffer, index, "Long");+ inputSpec.appendCommonAnnotations(buffer, index);+ if (!inputSpec.isAllowEmpty())+ buffer.append(" @NotNull\n");+ buffer.append(" @PullRequestChoice\n");+ inputSpec.appendMethods(buffer, index, "Long", null, null);++ return buffer.toString();+ }++ public static Object convertToObject(List<String> strings) {+ if (strings.size() == 0) {+ return null;+ } else if (strings.size() == 1) {+ String value = strings.iterator().next();+ try {+ return Long.valueOf(value);+ } catch (NumberFormatException e) {+ throw new ValidationException("Invalid pull request number");+ }+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }+ }++ public static List<String> convertToStrings(Object value) {+ if (value instanceof Long)+ return Lists.newArrayList((String) value);+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/SecretInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/SecretInput.javanew file mode 100755index 0000000000..eea2c8343e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/SecretInput.java@@ -0,0 +1,43 @@+package io.onedev.server.model.support.inputspec;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.ValidationException;++import com.google.common.collect.Lists;++public class SecretInput {++ public static final String MASK = "*****";++ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes) {+ int index = indexes.get(inputSpec.getName());+ StringBuffer buffer = new StringBuffer();+ inputSpec.appendField(buffer, index, "String");+ inputSpec.appendCommonAnnotations(buffer, index);+ buffer.append(" @NotEmpty\n");+ buffer.append(" @Password\n");+ inputSpec.appendMethods(buffer, index, "String", null, null);++ return buffer.toString();+ }++ public static Object convertToObject(List<String> strings) {+ if (strings.size() == 0)+ return null;+ else if (strings.size() == 1)+ return strings.iterator().next();+ else+ throw new ValidationException("Not eligible for multi-value");+ }++ public static List<String> convertToStrings(Object value) {+ if (value instanceof String)+ return Lists.newArrayList((String)value);+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.javanew file mode 100755index 0000000000..39ad9246ef--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java@@ -0,0 +1,56 @@+package io.onedev.server.model.support.inputspec.booleaninput;++import java.util.List;+import java.util.Map;++import javax.validation.ValidationException;++import com.google.common.collect.Lists;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;++public class BooleanInput {++ public static List<String> getPossibleValues() {+ return Lists.newArrayList(StringUtils.describe(true), StringUtils.describe(false));+ }++ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,+ DefaultValueProvider defaultValueProvider) {+ int index = indexes.get(inputSpec.getName());++ StringBuffer buffer = new StringBuffer();+ inputSpec.appendField(buffer, index, "Boolean");+ inputSpec.appendCommonAnnotations(buffer, index);+ buffer.append(" @NotNull(message=\"May not be empty\")\n");+ inputSpec.appendMethods(buffer, index, "Boolean", null, defaultValueProvider);++ return buffer.toString();+ }++ public static Object convertToObject(List<String> strings) {+ if (strings.size() == 0) {+ throw new ValidationException("Invalid boolean value");+ } else if (strings.size() == 1) {+ String string = strings.iterator().next();+ if (string.equalsIgnoreCase("true") || string.equalsIgnoreCase(StringUtils.describe(true)))+ return true;+ else if (string.equalsIgnoreCase("false") || string.equalsIgnoreCase(StringUtils.describe(false)))+ return false;+ else+ throw new ValidationException("Invalid boolean value");+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }+ }++ public static List<String> convertToStrings(Object value) {+ if (value instanceof Boolean)+ return Lists.newArrayList(StringUtils.describe((Boolean)value));+ else+ return Lists.newArrayList(StringUtils.describe(false));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.javaold mode 100644new mode 100755similarity index 69%rename from server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.javaindex 33c0adae8d..242163023f--- a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.javaold mode 100644new mode 100755similarity index 76%rename from server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.javaindex 1ae6af9952..11275c06d1--- a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.javaold mode 100644new mode 100755similarity index 53%rename from server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.javaindex d0e204c0e9..049a7b458b--- a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,38 +1,35 @@-package io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;-import java.util.List;+import org.hibernate.validator.constraints.NotEmpty;-import javax.validation.constraints.Size;--import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.ScriptChoice;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultValue implements DefaultValueProvider {private static final long serialVersionUID = 1L;- private List<String> script;+ private String scriptName;@Editable(description="Groovy script to be evaluated. It should return a <i>boolean</i> value. "+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")- @Script(Script.GROOVY)+ @ScriptChoice@OmitName- @Size(min=1, message="may not be empty")- public List<String> getScript() {- return script;+ @NotEmpty+ public String getScriptName() {+ return scriptName;}- public void setScript(List<String> script) {- this.script = script;+ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;}@Overridepublic boolean getDefaultValue() {- return (boolean) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));+ return (boolean) GroovyUtils.evalScriptByName(scriptName);}}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.javaold mode 100644new mode 100755similarity index 76%rename from server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.javaindex 817545bf9e..7dcf76ffaa--- a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/ChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/ChoiceInput.javanew file mode 100755index 0000000000..d6300624fd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/ChoiceInput.java@@ -0,0 +1,93 @@+package io.onedev.server.model.support.inputspec.choiceinput;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.ValidationException;+import javax.validation.Validator;++import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.server.OneDev;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;+import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.DefaultValueProvider;++public class ChoiceInput {++ public static List<String> getPossibleValues(ChoiceProvider choiceProvider) {+ List<String> possibleValues = new ArrayList<>();+ if (OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())+ possibleValues.addAll(choiceProvider.getChoices(true).keySet());+ return possibleValues;+ }++ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,+ ChoiceProvider choiceProvider, DefaultValueProvider defaultValueProvider,+ DefaultMultiValueProvider defaultMultiValueProvider) {+ int index = indexes.get(inputSpec.getName());+ StringBuffer buffer = new StringBuffer();+ inputSpec.appendField(buffer, index, inputSpec.isAllowMultiple()? "List<String>": "String");+ inputSpec.appendCommonAnnotations(buffer, index);+ if (!inputSpec.isAllowEmpty()) {+ if (inputSpec.isAllowMultiple())+ buffer.append(" @Size(min=1, message=\"At least one option needs to be selected\")\n");+ else+ buffer.append(" @NotEmpty\n");+ }+ inputSpec.appendChoiceProvider(buffer, index, "@ChoiceProvider");++ if (inputSpec.isAllowMultiple())+ inputSpec.appendMethods(buffer, index, "List<String>", choiceProvider, defaultMultiValueProvider);+ else+ inputSpec.appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);++ return buffer.toString();+ }++ public static Object convertToObject(InputSpec inputSpec, List<String> strings) {+ if (inputSpec.isAllowMultiple()) {+ List<String> possibleValues = inputSpec.getPossibleValues();+ if (!possibleValues.isEmpty()) {+ List<String> copyOfStrings = new ArrayList<>(strings);+ copyOfStrings.removeAll(possibleValues);+ if (!copyOfStrings.isEmpty())+ throw new ValidationException("Invalid choice values: " + copyOfStrings);+ else+ return strings;+ } else {+ return strings;+ }+ } else if (strings.size() == 0) {+ return null;+ } else if (strings.size() == 1) {+ String value = strings.iterator().next();+ List<String> possibleValues = inputSpec.getPossibleValues();+ if (!possibleValues.isEmpty()) {+ if (!possibleValues.contains(value))+ throw new ValidationException("Invalid choice value");+ else+ return value;+ } else {+ return value;+ }+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }+ }++ @SuppressWarnings("unchecked")+ public static List<String> convertToStrings(InputSpec inputSpec, Object value) {+ List<String> strings = new ArrayList<>();+ if (inputSpec.isAllowMultiple()) {+ if (inputSpec.checkListElements(value, String.class))+ strings.addAll((List<String>) value);+ Collections.sort(strings);+ } else if (value instanceof String) {+ strings.add((String) value);+ }+ return strings;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.javaold mode 100644new mode 100755similarity index 92%rename from server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.javaindex f0323edfba..a22cf5de59--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.choiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;import java.io.Serializable;import java.util.UUID;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ChoiceProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ChoiceProvider.javaold mode 100644new mode 100755similarity index 80%rename from server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ChoiceProvider.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ChoiceProvider.javaindex f9b6603581..047e266cb7--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ChoiceProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.choiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;import java.io.Serializable;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.javaold mode 100644new mode 100755similarity index 76%rename from server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.javaindex 2a8f61dd5d..dfb2a2dc19--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.java@@ -1,20 +1,18 @@-package io.onedev.server.util.inputspec.choiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.validation.constraints.Size;-+import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneException;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.ScriptChoice;@Editable(order=300, name="Evaluate script to get choices")public class ScriptingChoices extends ChoiceProvider {@@ -23,21 +21,21 @@ public class ScriptingChoices extends ChoiceProvider {private static final Logger logger = LoggerFactory.getLogger(ScriptingChoices.class);- private List<String> script;+ private String scriptName;@Editable(description="Groovy script to be evaluated. The return value should be a value to color map, "+ "for instance:<br>"+ "<code>return [\"Successful\":\"#00ff00\", \"Failed\":\"#ff0000\"]</code>, "+ "Use <tt>null</tt> if the value does not have a color. Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")- @Script(Script.GROOVY)+ @ScriptChoice@OmitName- @Size(min=1, message="may not be empty")- public List<String> getScript() {- return script;+ @NotEmpty+ public String getScriptName() {+ return scriptName;}- public void setScript(List<String> script) {- this.script = script;+ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;}@SuppressWarnings("unchecked")@@ -45,8 +43,9 @@ public class ScriptingChoices extends ChoiceProvider {public Map<String, String> getChoices(boolean allPossible) {Map<String, Object> variables = new HashMap<>();variables.put("allPossible", allPossible);+try {- Object result = GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"), variables);+ Object result = GroovyUtils.evalScriptByName(scriptName, variables);if (result instanceof Map) {return (Map<String, String>) result;} else if (result instanceof List) {diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.javaold mode 100644new mode 100755similarity index 73%rename from server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.javaindex c3ea8e0fdd..6cbe7250d8--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.choiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;import java.util.ArrayList;import java.util.HashSet;@@ -12,8 +12,9 @@ import javax.annotation.Nullable;import javax.validation.ConstraintValidatorContext;import javax.validation.constraints.Size;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;+import io.onedev.server.ci.job.paramspec.ChoiceParam;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.issue.fieldspec.ChoiceField;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Editable;@@ -52,11 +53,16 @@ public class SpecifiedChoices extends ChoiceProvider implements Validatable {@Nullablepublic static SpecifiedChoices of(@Nullable InputSpec inputSpec) {- if (inputSpec instanceof ChoiceInput) {- ChoiceInput choiceInput = (ChoiceInput) inputSpec;- if (choiceInput.getChoiceProvider() instanceof SpecifiedChoices)- return (SpecifiedChoices) choiceInput.getChoiceProvider();- }+ if (inputSpec instanceof ChoiceField) {+ ChoiceField choiceField = (ChoiceField) inputSpec;+ if (choiceField.getChoiceProvider() instanceof SpecifiedChoices)+ return (SpecifiedChoices) choiceField.getChoiceProvider();+ } else if (inputSpec instanceof ChoiceParam) {+ ChoiceParam choiceParam = (ChoiceParam) inputSpec;+ if (choiceParam.getChoiceProvider() instanceof SpecifiedChoices)+ return (SpecifiedChoices) choiceParam.getChoiceProvider();+ }+return null;}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.javaold mode 100644new mode 100755similarity index 72%rename from server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.javaindex 53544031f4..f48f548cdb--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.choiceinput.defaultmultivalueprovider;+package io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider;import java.io.Serializable;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.javaold mode 100644new mode 100755similarity index 56%rename from server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.javaindex 6a6208a3e2..f90ae1d53e--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java@@ -1,39 +1,38 @@-package io.onedev.server.util.inputspec.choiceinput.defaultmultivalueprovider;+package io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider;import java.util.List;-import javax.validation.constraints.Size;+import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.ScriptChoice;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultMultiValue implements DefaultMultiValueProvider {private static final long serialVersionUID = 1L;- private List<String> script;+ private String scriptName;@Editable(description="Groovy script to be evaluated. It should return list of string. "+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")- @Script(Script.GROOVY)+ @ScriptChoice@OmitName- @Size(min=1, message="may not be empty")- public List<String> getScript() {- return script;+ @NotEmpty+ public String getScriptName() {+ return scriptName;}- public void setScript(List<String> script) {- this.script = script;+ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;}@SuppressWarnings("unchecked")@Overridepublic List<String> getDefaultValue() {- return (List<String>) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));+ return (List<String>) GroovyUtils.evalScriptByName(scriptName);}}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javaold mode 100644new mode 100755similarity index 78%rename from server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javaindex 2e14f07556..675f0f7b88--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.choiceinput.defaultmultivalueprovider;+package io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider;import java.util.ArrayList;import java.util.List;@@ -10,8 +10,8 @@ import org.hibernate.validator.constraints.NotEmpty;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -41,7 +41,7 @@ public class SpecifiedDefaultMultiValue implements DefaultMultiValueProvider {@SuppressWarnings("unused")private static List<String> getValueChoices() {- ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");+ ChoiceProvider choiceProvider = (ChoiceProvider) EditContext.get(1).getInputValue("choiceProvider");if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())return new ArrayList<>(choiceProvider.getChoices(true).keySet());elsediff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/DefaultValueProvider.javaold mode 100644new mode 100755similarity index 70%rename from server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/DefaultValueProvider.javaindex 3072cdd429..9d3f1d9c27--- a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.textinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.javaold mode 100644new mode 100755similarity index 53%rename from server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 803119bb1f..c093d6c202--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,38 +1,35 @@-package io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider;-import java.util.List;+import org.hibernate.validator.constraints.NotEmpty;-import javax.validation.constraints.Size;--import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.ScriptChoice;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultValue implements DefaultValueProvider {private static final long serialVersionUID = 1L;- private List<String> script;+ private String scriptName;@Editable(description="Groovy script to be evaluated. It should return a <i>string</i> value. "+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")- @Script(Script.GROOVY)+ @ScriptChoice@OmitName- @Size(min=1, message="may not be empty")- public List<String> getScript() {- return script;+ @NotEmpty+ public String getScriptName() {+ return scriptName;}- public void setScript(List<String> script) {- this.script = script;+ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;}@Overridepublic String getDefaultValue() {- return (String) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));+ return (String) GroovyUtils.evalScriptByName(scriptName);}}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaold mode 100644new mode 100755similarity index 77%rename from server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 4b302e7663..98453755a3--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider;import java.util.ArrayList;import java.util.List;@@ -8,8 +8,8 @@ import javax.validation.Validator;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -39,7 +39,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {@SuppressWarnings("unused")private static List<String> getValueChoices() {- ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");+ ChoiceProvider choiceProvider = (ChoiceProvider) EditContext.get(1).getInputValue("choiceProvider");if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())return new ArrayList<>(choiceProvider.getChoices(true).keySet());elsediff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/DateInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/DateInput.javanew file mode 100755index 0000000000..b925be954e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/DateInput.java@@ -0,0 +1,48 @@+package io.onedev.server.model.support.inputspec.dateinput;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.ValidationException;++import org.joda.time.DateTime;++import com.google.common.collect.Lists;++import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.Constants;++public class DateInput {++ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,+ DefaultValueProvider defaultValueProvider) {+ int index = indexes.get(inputSpec.getName());+ StringBuffer buffer = new StringBuffer();+ inputSpec.appendField(buffer, index, "Date");+ inputSpec.appendCommonAnnotations(buffer, index);+ if (!inputSpec.isAllowEmpty())+ buffer.append(" @NotNull(message=\"May not be empty\")\n");+ inputSpec.appendMethods(buffer, index, "Date", null, defaultValueProvider);++ return buffer.toString();+ }++ public static Object convertToObject(List<String> strings) {+ if (strings.size() == 1)+ return Constants.DATE_FORMATTER.parseDateTime(strings.iterator().next()).toDate();+ else if (strings.size() == 0)+ return null;+ else+ throw new ValidationException("Not eligible for multi-value");+ }++ public static List<String> convertToStrings(Object value) {+ if (value != null)+ return Lists.newArrayList(Constants.DATE_FORMATTER.print(new DateTime(value)));+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.javaold mode 100644new mode 100755similarity index 72%rename from server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.javaindex 31d392fcc9..3907956cee--- a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.dateinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider;import java.io.Serializable;import java.util.Date;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.javaold mode 100644new mode 100755similarity index 54%rename from server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.javaindex eccfe0a883..2a581943ca--- a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,39 +1,37 @@-package io.onedev.server.util.inputspec.dateinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider;import java.util.Date;-import java.util.List;-import javax.validation.constraints.Size;+import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.ScriptChoice;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultValue implements DefaultValueProvider {private static final long serialVersionUID = 1L;- private List<String> script;+ private String scriptName;@Editable(description="Groovy script to be evaluated. It should return a <i>Date</i> value. "+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")- @Script(Script.GROOVY)+ @ScriptChoice@OmitName- @Size(min=1, message="may not be empty")- public List<String> getScript() {- return script;+ @NotEmpty+ public String getScriptName() {+ return scriptName;}- public void setScript(List<String> script) {- this.script = script;+ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;}@Overridepublic Date getDefaultValue() {- return (Date) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));+ return (Date) GroovyUtils.evalScriptByName(scriptName);}}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.javaold mode 100644new mode 100755similarity index 89%rename from server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 81935c1c6f..785b1e616e--- a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.dateinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider;import java.util.Date;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.javanew file mode 100755index 0000000000..09cd67c9ec--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.java@@ -0,0 +1,59 @@+package io.onedev.server.model.support.inputspec.groupchoiceinput;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.ValidationException;+import javax.validation.Validator;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.facade.GroupFacade;++public class GroupChoiceInput {++ public static List<String> getPossibleValues(ChoiceProvider choiceProvider) {+ List<String> possibleValues = new ArrayList<>();+ if (OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty()) {+ for (GroupFacade group: choiceProvider.getChoices(true))+ possibleValues.add(group.getName());+ }+ return possibleValues;+ }++ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,+ ChoiceProvider choiceProvider, DefaultValueProvider defaultValueProvider) {+ int index = indexes.get(inputSpec.getName());+ StringBuffer buffer = new StringBuffer();+ inputSpec.appendField(buffer, index, "String");+ inputSpec.appendCommonAnnotations(buffer, index);+ if (!inputSpec.isAllowEmpty())+ buffer.append(" @NotEmpty\n");+ inputSpec.appendChoiceProvider(buffer, index, "@GroupChoice");+ inputSpec.appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);++ return buffer.toString();+ }++ public static Object convertToObject(List<String> strings) {+ if (strings.size() == 0)+ return null;+ else if (strings.size() == 1)+ return strings.iterator().next();+ else+ throw new ValidationException("Not eligible for multi-value");+ }++ public static List<String> convertToStrings(Object value) {+ if (value instanceof String)+ return Lists.newArrayList((String) value);+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.javaold mode 100644new mode 100755similarity index 91%rename from server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.javaindex c78e054ac8..4cba04ca14--- a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider;import java.util.ArrayList;import java.util.Comparator;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.javaold mode 100644new mode 100755similarity index 77%rename from server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.javaindex 986c5fd739..9cb7d3a00c--- a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider;import java.io.Serializable;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.javaold mode 100644new mode 100755similarity index 70%rename from server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.javaindex 51945343d2..72ff8d03b9--- a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java@@ -1,21 +1,19 @@-package io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider;import java.util.ArrayList;import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.validation.constraints.Size;-+import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.GroovyUtils;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.ScriptChoice;@Editable(order=300, name="Evaluate script to get choices")public class ScriptingChoices implements ChoiceProvider {@@ -24,19 +22,19 @@ public class ScriptingChoices implements ChoiceProvider {private static final Logger logger = LoggerFactory.getLogger(ScriptingChoices.class);- private List<String> script;+ private String scriptName;@Editable(description="Groovy script to be evaluated. The return value should be a list of group facade object to be used as choices. "+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")- @Script(Script.GROOVY)+ @ScriptChoice@OmitName- @Size(min=1, message="may not be empty")- public List<String> getScript() {- return script;+ @NotEmpty+ public String getScriptName() {+ return scriptName;}- public void setScript(List<String> script) {- this.script = script;+ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;}@SuppressWarnings("unchecked")@@ -45,7 +43,7 @@ public class ScriptingChoices implements ChoiceProvider {Map<String, Object> variables = new HashMap<>();variables.put("allPossible", allPossible);try {- return (List<GroupFacade>) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"), variables);+ return (List<GroupFacade>) GroovyUtils.evalScriptByName(scriptName, variables);} catch (RuntimeException e) {if (allPossible) {logger.error("Error getting all possible choices", e);diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.javaold mode 100644new mode 100755similarity index 68%rename from server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.javaindex 840810ad4b..6d975c1604--- a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javaold mode 100644new mode 100755similarity index 52%rename from server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javaindex e69c0ba676..c0d5bd76cc--- a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,38 +1,35 @@-package io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider;-import java.util.List;+import org.hibernate.validator.constraints.NotEmpty;-import javax.validation.constraints.Size;--import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.ScriptChoice;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultValue implements DefaultValueProvider {private static final long serialVersionUID = 1L;- private List<String> script;+ private String scriptName;@Editable(description="Groovy script to be evaluated. It should return name of a group. "+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")- @Script(Script.GROOVY)+ @ScriptChoice@OmitName- @Size(min=1, message="may not be empty")- public List<String> getScript() {- return script;+ @NotEmpty+ public String getScriptName() {+ return scriptName;}- public void setScript(List<String> script) {- this.script = script;+ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;}@Overridepublic String getDefaultValue() {- return (String) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));+ return (String) GroovyUtils.evalScriptByName(scriptName);}}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaold mode 100644new mode 100755similarity index 78%rename from server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 1d5f9d6633..4d5e0de339--- a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider;import java.util.List;@@ -9,9 +9,9 @@ import org.hibernate.validator.constraints.NotEmpty;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.util.OneContext;+import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.EditContext;import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.GroupChoice;import io.onedev.server.web.editable.annotation.OmitName;@@ -42,7 +42,7 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {@SuppressWarnings("unused")private static List<GroupFacade> getValueChoices() {- ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");+ ChoiceProvider choiceProvider = (ChoiceProvider) EditContext.get(1).getInputValue("choiceProvider");if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())return choiceProvider.getChoices(true);elsediff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/NumberInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/NumberInput.javanew file mode 100755index 0000000000..4a86d2f003--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/NumberInput.java@@ -0,0 +1,59 @@+package io.onedev.server.model.support.inputspec.numberinput;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.ValidationException;++import com.google.common.collect.Lists;++import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.numberinput.defaultvalueprovider.DefaultValueProvider;++public class NumberInput {++ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,+ Integer minValue, Integer maxValue, DefaultValueProvider defaultValueProvider) {+ int index = indexes.get(inputSpec.getName());+ StringBuffer buffer = new StringBuffer();+ inputSpec.appendField(buffer, index, "Integer");+ inputSpec.appendCommonAnnotations(buffer, index);+ if (!inputSpec.isAllowEmpty())+ buffer.append(" @NotNull(message=\"May not be empty\")\n");+ if (minValue != null) {+ if (maxValue != null) {+ buffer.append(" @Range(min=" + minValue.toString() + "L,max=" + maxValue.toString() +"L)\n");+ } else {+ buffer.append(" @Range(min=" + minValue.toString() + "L)\n");+ }+ } else if (maxValue != null) {+ buffer.append(" @Range(max=" + maxValue.toString() + "L)\n");+ }+ inputSpec.appendMethods(buffer, index, "Integer", null, defaultValueProvider);++ return buffer.toString();+ }++ public static Object convertToObject(List<String> strings) {+ if (strings.size() == 0) {+ return null;+ } else if (strings.size() == 1) {+ try {+ return Integer.valueOf(strings.iterator().next());+ } catch (NumberFormatException e) {+ throw new ValidationException("Invalid number value");+ }+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }+ }++ public static List<String> convertToStrings(Object value) {+ if (value instanceof Integer)+ return Lists.newArrayList(String.valueOf(value));+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/DefaultValueProvider.javaold mode 100644new mode 100755similarity index 69%rename from server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/DefaultValueProvider.javaindex b33e877572..2979c2a53a--- a/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.numberinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.numberinput.defaultvalueprovider;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.javaold mode 100644new mode 100755similarity index 53%rename from server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.javaindex ea6d1baedb..38c8a8be87--- a/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,38 +1,35 @@-package io.onedev.server.util.inputspec.numberinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.numberinput.defaultvalueprovider;-import java.util.List;+import org.hibernate.validator.constraints.NotEmpty;-import javax.validation.constraints.Size;--import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.ScriptChoice;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultValue implements DefaultValueProvider {private static final long serialVersionUID = 1L;- private List<String> script;+ private String scriptName;@Editable(description="Groovy script to be evaluated. It should return a <i>Integer</i> value. "+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")- @Script(Script.GROOVY)+ @ScriptChoice@OmitName- @Size(min=1, message="may not be empty")- public List<String> getScript() {- return script;+ @NotEmpty+ public String getScriptName() {+ return scriptName;}- public void setScript(List<String> script) {- this.script = script;+ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;}@Overridepublic int getDefaultValue() {- return (int) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));+ return (int) GroovyUtils.evalScriptByName(scriptName);}}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/SpecifiedDefaultValue.javaold mode 100644new mode 100755similarity index 86%rename from server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 424df258d7..67ba621d54--- a/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.numberinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.numberinput.defaultvalueprovider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.javasimilarity index 75%rename from server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.javaindex a23f32accc..36aa00dc71 100644--- a/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.showcondition;+package io.onedev.server.model.support.inputspec.showcondition;import java.io.Serializable;import java.util.ArrayList;@@ -10,9 +10,12 @@ import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.google.common.base.Preconditions;+import io.onedev.server.OneException;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -28,7 +31,7 @@ public class ShowCondition implements Serializable {private ValueMatcher valueMatcher = new ValueIsOneOf();- @Editable(order=100, name="resource.input.input")+ @Editable(order=100, name="When")@ChoiceProvider("getNameChoices")@NotEmptypublic String getInputName() {@@ -52,13 +55,13 @@ public class ShowCondition implements Serializable {@SuppressWarnings("unused")private static List<String> getNameChoices() {- return new ArrayList<>(OneContext.get().getInputContext().getInputNames());+ return new ArrayList<>(Preconditions.checkNotNull(InputContext.get().getInputNames()));}public boolean isVisible() {- InputSpec inputSpec = OneContext.get().getInputContext().getInputSpec(getInputName());+ InputSpec inputSpec = Preconditions.checkNotNull(InputContext.get()).getInputSpec(getInputName());if (inputSpec != null) {- Object inputValue = OneContext.get().getEditContext().getInputValue(getInputName());+ Object inputValue = EditContext.get().getInputValue(getInputName());List<String> strings = inputSpec.convertToStrings(inputValue);if (strings.isEmpty())return getValueMatcher().matches(null);diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsEmpty.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsEmpty.javasimilarity index 81%rename from server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsEmpty.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsEmpty.javaindex 405b34184f..21d45277a2 100644--- a/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsEmpty.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsEmpty.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.showcondition;+package io.onedev.server.model.support.inputspec.showcondition;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotAnyOf.javasimilarity index 74%rename from server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotAnyOf.javaindex dd27e747dd..aaedd2dc72 100644--- a/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotAnyOf.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.showcondition;+package io.onedev.server.model.support.inputspec.showcondition;import java.util.List;@@ -7,10 +7,12 @@ import javax.validation.constraints.Size;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.google.common.base.Preconditions;import com.google.common.collect.Lists;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -39,9 +41,9 @@ public class ValueIsNotAnyOf implements ValueMatcher {@SuppressWarnings("unused")private static List<String> getValueChoices() {// Access on-screen value of ShowCondition.fiedName- String inputName = (String) OneContext.get().getEditContext(1).getInputValue("inputName");+ String inputName = (String) EditContext.get(1).getInputValue("inputName");if (inputName != null) {- InputSpec inputSpec = OneContext.get().getInputContext().getInputSpec(inputName);+ InputSpec inputSpec = Preconditions.checkNotNull(InputContext.get()).getInputSpec(inputName);if (inputSpec != null)return inputSpec.getPossibleValues();elsediff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotEmpty.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotEmpty.javasimilarity index 82%rename from server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotEmpty.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotEmpty.javaindex 3631770f64..b1cbbb3799 100644--- a/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotEmpty.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotEmpty.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.showcondition;+package io.onedev.server.model.support.inputspec.showcondition;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsOneOf.javasimilarity index 74%rename from server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsOneOf.javaindex 3db7488b17..4e7788a548 100644--- a/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsOneOf.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.showcondition;+package io.onedev.server.model.support.inputspec.showcondition;import java.util.List;@@ -7,10 +7,12 @@ import javax.validation.constraints.Size;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.google.common.base.Preconditions;import com.google.common.collect.Lists;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -39,9 +41,9 @@ public class ValueIsOneOf implements ValueMatcher {@SuppressWarnings("unused")private static List<String> getValueChoices() {// Access on-screen value of ShowCondition.inputName- String inputName = (String) OneContext.get().getEditContext(1).getInputValue("inputName");+ String inputName = (String) EditContext.get(1).getInputValue("inputName");if (inputName != null) {- InputSpec inputSpec = OneContext.get().getInputContext().getInputSpec(inputName);+ InputSpec inputSpec = Preconditions.checkNotNull(InputContext.get()).getInputSpec(inputName);if (inputSpec != null)return inputSpec.getPossibleValues();elsediff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueMatcher.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueMatcher.javasimilarity index 74%rename from server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueMatcher.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueMatcher.javaindex fb91966d98..948fe98694 100644--- a/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueMatcher.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueMatcher.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.showcondition;+package io.onedev.server.model.support.inputspec.showcondition;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.javanew file mode 100755index 0000000000..a873e4ea87--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.java@@ -0,0 +1,49 @@+package io.onedev.server.model.support.inputspec.textinput;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.ValidationException;++import com.google.common.collect.Lists;++import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;++public class TextInput {++ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,+ String pattern, DefaultValueProvider defaultValueProvider, boolean multiline) {+ int index = indexes.get(inputSpec.getName());+ StringBuffer buffer = new StringBuffer();+ inputSpec.appendField(buffer, index, "String");+ inputSpec.appendCommonAnnotations(buffer, index);+ if (!inputSpec.isAllowEmpty())+ buffer.append(" @NotEmpty\n");+ if (multiline)+ buffer.append(" @Multiline\n");+ if (pattern != null)+ buffer.append(" @Pattern(regexp=\"" + pattern + "\", message=\"Should match regular expression: " + pattern + "\")\n");+ inputSpec.appendMethods(buffer, index, "String", null, defaultValueProvider);++ return buffer.toString();+ }++ public static Object convertToObject(List<String> strings) {+ if (strings.size() == 0)+ return null;+ else if (strings.size() == 1)+ return strings.iterator().next();+ else+ throw new ValidationException("Not eligible for multi-value");+ }++ public static List<String> convertToStrings(Object value) {+ if (value instanceof String)+ return Lists.newArrayList((String)value);+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.javaold mode 100644new mode 100755similarity index 70%rename from server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.javaindex 11ef816754..63a92618b2--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.javaold mode 100644new mode 100755similarity index 53%rename from server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 3b3bc77285..8fa8a8ae17--- a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,38 +1,35 @@-package io.onedev.server.util.inputspec.textinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider;-import java.util.List;+import org.hibernate.validator.constraints.NotEmpty;-import javax.validation.constraints.Size;--import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.ScriptChoice;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultValue implements DefaultValueProvider {private static final long serialVersionUID = 1L;- private List<String> script;+ private String scriptName;@Editable(description="Groovy script to be evaluated. It should return a <i>String</i> value. "+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")- @Script(Script.GROOVY)+ @ScriptChoice@OmitName- @Size(min=1, message="may not be empty")- public List<String> getScript() {- return script;+ @NotEmpty+ public String getScriptName() {+ return scriptName;}- public void setScript(List<String> script) {- this.script = script;+ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;}@Overridepublic String getDefaultValue() {- return (String) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));+ return (String) GroovyUtils.evalScriptByName(scriptName);}}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.javaold mode 100644new mode 100755similarity index 89%rename from server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex b2e01f8e75..1920f856df--- a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.textinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.javanew file mode 100755index 0000000000..03fc0c153c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.java@@ -0,0 +1,54 @@+package io.onedev.server.model.support.inputspec.userchoiceinput;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;+import java.util.stream.Collectors;++import javax.validation.ValidationException;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;++public class UserChoiceInput {++ public static List<String> getPossibleValues() {+ return OneDev.getInstance(UserManager.class).query().stream().map(user->user.getName()).collect(Collectors.toList());+ }++ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,+ ChoiceProvider choiceProvider, DefaultValueProvider defaultValueProvider) {+ int index = indexes.get(inputSpec.getName());+ StringBuffer buffer = new StringBuffer();+ inputSpec.appendField(buffer, index, "String");+ inputSpec.appendCommonAnnotations(buffer, index);+ if (!inputSpec.isAllowEmpty())+ buffer.append(" @NotEmpty\n");+ inputSpec.appendChoiceProvider(buffer, index, "@UserChoice");+ inputSpec.appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);++ return buffer.toString();+ }++ public static Object convertToObject(List<String> strings) {+ if (strings.size() == 0)+ return null;+ else if (strings.size() == 1)+ return strings.iterator().next();+ else+ throw new ValidationException("Not eligible for multi-value");+ }++ public static List<String> convertToStrings(Object value) {+ if (value instanceof String)+ return Lists.newArrayList((String) value);+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.javaold mode 100644new mode 100755similarity index 77%rename from server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.javaindex 00a684e504..4f0dfda544--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.userchoiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;import java.io.Serializable;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/CodeReaders.javaold mode 100644new mode 100755similarity index 81%rename from server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/CodeReaders.javaindex 1b5d2a9077..140b1c2b25--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/CodeReaders.java@@ -1,11 +1,10 @@-package io.onedev.server.util.inputspec.userchoiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;import java.util.ArrayList;import java.util.List;import io.onedev.server.model.Project;import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.OneContext;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.editable.annotation.Editable;@@ -17,7 +16,7 @@ public class CodeReaders implements ChoiceProvider {@Overridepublic List<UserFacade> getChoices(boolean allPossible) {- Project project = OneContext.get().getProject();+ Project project = Project.get();if (project != null)return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.CODE_READ));elsediff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/CodeWriters.javaold mode 100644new mode 100755similarity index 81%rename from server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/CodeWriters.javaindex 32a528d51b..faa390f1a1--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/CodeWriters.java@@ -1,11 +1,10 @@-package io.onedev.server.util.inputspec.userchoiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;import java.util.ArrayList;import java.util.List;import io.onedev.server.model.Project;import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.OneContext;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.editable.annotation.Editable;@@ -17,7 +16,7 @@ public class CodeWriters implements ChoiceProvider {@Overridepublic List<UserFacade> getChoices(boolean allPossible) {- Project project = OneContext.get().getProject();+ Project project = Project.get();if (project != null)return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.CODE_WRITE));elsediff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/GroupUsers.javaold mode 100644new mode 100755similarity index 93%rename from server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/GroupUsers.javaindex 3bab222dcc..778ff2d30e--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/GroupUsers.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.userchoiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/IssueReaders.javaold mode 100644new mode 100755similarity index 81%rename from server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/IssueReaders.javaindex f6e2e8047a..8a25344044--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/IssueReaders.java@@ -1,11 +1,10 @@-package io.onedev.server.util.inputspec.userchoiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;import java.util.ArrayList;import java.util.List;import io.onedev.server.model.Project;import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.OneContext;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.editable.annotation.Editable;@@ -17,7 +16,7 @@ public class IssueReaders implements ChoiceProvider {@Overridepublic List<UserFacade> getChoices(boolean allPossible) {- Project project = OneContext.get().getProject();+ Project project = Project.get();if (project != null)return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.ISSUE_READ));elsediff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.javaold mode 100644new mode 100755similarity index 81%rename from server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.javaindex d0ddf73554..fb1d0cadd3--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java@@ -1,11 +1,10 @@-package io.onedev.server.util.inputspec.userchoiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;import java.util.ArrayList;import java.util.List;import io.onedev.server.model.Project;import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.OneContext;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.editable.annotation.Editable;@@ -17,7 +16,7 @@ public class ProjectAdministrators implements ChoiceProvider {@Overridepublic List<UserFacade> getChoices(boolean allPossible) {- Project project = OneContext.get().getProject();+ Project project = Project.get();if (project != null)return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.ADMINISTRATION));elsediff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.javaold mode 100644new mode 100755similarity index 70%rename from server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.javaindex 8a7bc33f79..9e9f4ba1a2--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java@@ -1,21 +1,19 @@-package io.onedev.server.util.inputspec.userchoiceinput.choiceprovider;+package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;import java.util.ArrayList;import java.util.HashMap;import java.util.List;import java.util.Map;-import javax.validation.constraints.Size;-+import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.GroovyUtils;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.ScriptChoice;@Editable(order=300, name="Evaluate script to get choices")public class ScriptingChoices implements ChoiceProvider {@@ -24,19 +22,19 @@ public class ScriptingChoices implements ChoiceProvider {private static final Logger logger = LoggerFactory.getLogger(ScriptingChoices.class);- private List<String> script;+ private String scriptName;@Editable(description="Groovy script to be evaluated. The return value should be a list of user facade object to be used as choices. "+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")- @Script(Script.GROOVY)+ @ScriptChoice@OmitName- @Size(min=1, message="may not be empty")- public List<String> getScript() {- return script;+ @NotEmpty+ public String getScriptName() {+ return scriptName;}- public void setScript(List<String> script) {- this.script = script;+ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;}@SuppressWarnings("unchecked")@@ -45,7 +43,7 @@ public class ScriptingChoices implements ChoiceProvider {Map<String, Object> variables = new HashMap<>();variables.put("allPossible", allPossible);try {- return (List<UserFacade>) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"), variables);+ return (List<UserFacade>) GroovyUtils.evalScriptByName(scriptName, variables);} catch (RuntimeException e) {if (allPossible) {logger.error("Error getting all possible choices", e);diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.javaold mode 100644new mode 100755similarity index 69%rename from server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.javaindex 29fcdf699a..7ed73b6321--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javaold mode 100644new mode 100755similarity index 52%rename from server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 5003c06941..639fb56513--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,38 +1,35 @@-package io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider;-import java.util.List;+import org.hibernate.validator.constraints.NotEmpty;-import javax.validation.constraints.Size;--import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.ScriptChoice;@Editable(order=400, name="Evaluate script to get default value")public class ScriptingDefaultValue implements DefaultValueProvider {private static final long serialVersionUID = 1L;- private List<String> script;+ private String scriptName;@Editable(description="Groovy script to be evaluated. It should return login name of an user. "+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")- @Script(Script.GROOVY)+ @ScriptChoice@OmitName- @Size(min=1, message="may not be empty")- public List<String> getScript() {- return script;+ @NotEmpty+ public String getScriptName() {+ return scriptName;}- public void setScript(List<String> script) {- this.script = script;+ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;}@Overridepublic String getDefaultValue() {- return (String) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));+ return (String) GroovyUtils.evalScript(scriptName);}}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaold mode 100644new mode 100755similarity index 92%rename from server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 5dd595a3d7..6a5c3f79ad--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider;+package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider;import java.util.List;import java.util.stream.Collectors;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex a26d98e500..c4ba45df40 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -19,17 +19,16 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.Project;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.fieldspec.ChoiceField;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.fieldspec.GroupChoiceField;+import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.util.EditContext;import io.onedev.server.util.IssueConstants;-import io.onedev.server.util.OneContext;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;-import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;-import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.web.component.stringchoice.StringChoiceProvider;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@@ -138,10 +137,9 @@ public class BoardSpec implements Serializable {@SuppressWarnings("unused")private static List<String> getIdentifyFieldChoices() {List<String> choices = new ArrayList<>();- Project project = OneContext.get().getProject();choices.add(IssueConstants.FIELD_STATE);- for (InputSpec fieldSpec: getGlobalIssueSetting().getFieldSpecs()) {- if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceInput || fieldSpec instanceof UserChoiceInput || fieldSpec instanceof GroupChoiceInput))+ for (FieldSpec fieldSpec: getGlobalIssueSetting().getFieldSpecs()) {+ if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceField || fieldSpec instanceof UserChoiceField || fieldSpec instanceof GroupChoiceField))choices.add(fieldSpec.getName());}return choices;@@ -150,9 +148,8 @@ public class BoardSpec implements Serializable {@SuppressWarnings("unused")private static List<String> getDisplayFieldsChoices() {List<String> choices = new ArrayList<>();- Project project = OneContext.get().getProject();choices.add(IssueConstants.FIELD_STATE);- for (InputSpec fieldSpec: getGlobalIssueSetting().getFieldSpecs()) {+ for (FieldSpec fieldSpec: getGlobalIssueSetting().getFieldSpecs()) {choices.add(fieldSpec.getName());}return choices;@@ -161,13 +158,12 @@ public class BoardSpec implements Serializable {@SuppressWarnings("unused")private static Map<String, String> getColumnChoices() {Map<String, String> choices = new LinkedHashMap<>();- Project project = OneContext.get().getProject();- String fieldName = (String) OneContext.get().getEditContext().getInputValue("identifyField");+ String fieldName = (String) EditContext.get().getInputValue("identifyField");if (IssueConstants.FIELD_STATE.equals(fieldName)) {for (StateSpec state: getGlobalIssueSetting().getStateSpecs())choices.put(state.getName(), state.getName());} else if (fieldName != null) {- InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);+ FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);if (fieldSpec != null) {for (String each: fieldSpec.getPossibleValues())choices.put(each, each);@@ -240,13 +236,13 @@ public class BoardSpec implements Serializable {}}if (!IssueConstants.FIELD_STATE.equals(getIdentifyField())) {- InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(getIdentifyField());+ FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(getIdentifyField());if (fieldSpec == null)undefinedFields.add(getIdentifyField());}for (String displayField: getDisplayFields()) {if (!IssueConstants.FIELD_STATE.equals(displayField)) {- InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(displayField);+ FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(displayField);if (fieldSpec == null)undefinedFields.add(displayField);}@@ -311,8 +307,8 @@ public class BoardSpec implements Serializable {}public void onRenameUser(GlobalIssueSetting issueSetting, String oldName, String newName) {- InputSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());- if (fieldSpec instanceof UserChoiceInput) {+ FieldSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());+ if (fieldSpec instanceof UserChoiceField) {for (int i=0; i<getColumns().size(); i++) {if (getColumns().get(i).equals(oldName))getColumns().set(i, newName);@@ -322,8 +318,8 @@ public class BoardSpec implements Serializable {@Nullablepublic Usage onDeleteUser(GlobalIssueSetting issueSetting, String userName) {- InputSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());- if (fieldSpec instanceof UserChoiceInput) {+ FieldSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());+ if (fieldSpec instanceof UserChoiceField) {for (Iterator<String> it = getColumns().iterator(); it.hasNext();) {if (it.next().equals(userName))it.remove();diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.javaindex 45bd976ad8..0ba2d23f6d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java@@ -14,7 +14,7 @@ import javax.annotation.Nullable;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.javaindex 23c6ce9ab4..60024ae297 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java@@ -8,7 +8,6 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Color;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable@@ -48,7 +47,6 @@ public class StateSpec implements Serializable {@Editable(order=200)@NameOfEmptyValue("No description")- @Multilinepublic String getDescription() {return description;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.javaindex 2e7e3107c3..2d61bf5146 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java@@ -17,6 +17,9 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.model.support.issue.transitionprerequisite.TransitionPrerequisite;import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsNotAnyOf;import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsOneOf;@@ -25,12 +28,9 @@ import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTriimport io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.model.support.issue.transitiontrigger.PullRequestTrigger;import io.onedev.server.model.support.issue.transitiontrigger.TransitionTrigger;-import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.Input;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@@ -126,7 +126,7 @@ public class TransitionSpec implements Serializable {@SuppressWarnings("unused")private static List<String> getFieldChoices() {List<String> fields = new ArrayList<>();- for (InputSpec field: getGlobalIssueSetting().getFieldSpecs())+ for (FieldSpec field: getGlobalIssueSetting().getFieldSpecs())fields.add(field.getName());return fields;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.javaindex 4779d3e08b..d13dcc23c6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java@@ -15,9 +15,9 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Group;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.CommentSupport;import io.onedev.server.util.Input;-import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.component.diff.plain.PlainDiffPanel;public class IssueFieldChangeData implements IssueChangeData {@@ -108,14 +108,14 @@ public class IssueFieldChangeData implements IssueChangeData {for (Input oldField: oldFields.values()) {Input newField = newFields.get(oldField.getName());if (newField != null && !describe(oldField).equals(describe(newField))- && newField.getType().equals(InputSpec.USER) && !newField.getValues().isEmpty()) {+ && newField.getType().equals(FieldSpec.USER) && !newField.getValues().isEmpty()) {User user = userManager.findByName(newField.getValues().iterator().next());if (user != null)newUsers.put(newField.getName(), user);}}for (Input newField: newFields.values()) {- if (!oldFields.containsKey(newField.getName()) && newField.getType().equals(InputSpec.USER)+ if (!oldFields.containsKey(newField.getName()) && newField.getType().equals(FieldSpec.USER)&& !newField.getValues().isEmpty()) {User user = userManager.findByName(newField.getValues().iterator().next());if (user != null)@@ -134,7 +134,7 @@ public class IssueFieldChangeData implements IssueChangeData {Input newField = newFields.get(oldField.getName());if (newField != null&& !describe(oldField).equals(describe(newField))- && newField.getType().equals(InputSpec.GROUP)+ && newField.getType().equals(FieldSpec.GROUP)&& !newField.getValues().isEmpty()) {Group group = groupManager.find(newField.getValues().iterator().next());if (group != null)@@ -143,7 +143,7 @@ public class IssueFieldChangeData implements IssueChangeData {}for (Input newField: newFields.values()) {if (!oldFields.containsKey(newField.getName())- && newField.getType().equals(InputSpec.GROUP)+ && newField.getType().equals(FieldSpec.GROUP)&& !newField.getValues().isEmpty()) {Group group = groupManager.find(newField.getValues().iterator().next());if (group != null)diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/BooleanField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/BooleanField.javanew file mode 100644index 0000000000..c974ce53c9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/BooleanField.java@@ -0,0 +1,64 @@+package io.onedev.server.model.support.issue.fieldspec;++import java.util.List;+import java.util.Map;++import javax.validation.Valid;+import javax.validation.constraints.NotNull;++import io.onedev.server.model.support.inputspec.booleaninput.BooleanInput;+import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.FalseDefaultValue;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=300, name=FieldSpec.BOOLEAN)+public class BooleanField extends FieldSpec {++ private static final long serialVersionUID = 1L;++ private DefaultValueProvider defaultValueProvider = new FalseDefaultValue();++ @Editable(name="Default Value", order=1000)+ @NotNull(message="may not be empty")+ @Valid+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public List<String> getPossibleValues() {+ return BooleanInput.getPossibleValues();+ }++ @Editable+ @Override+ public boolean isAllowEmpty() {+ return false;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return BooleanInput.getPropertyDef(this, indexes, defaultValueProvider);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return BooleanInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return BooleanInput.convertToStrings(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/BuildChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/BuildChoiceField.javanew file mode 100644index 0000000000..b159aff9dc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/BuildChoiceField.java@@ -0,0 +1,43 @@+package io.onedev.server.model.support.issue.fieldspec;++import java.util.List;+import java.util.Map;++import io.onedev.server.model.support.inputspec.BuildChoiceInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=1200, name=FieldSpec.BUILD)+public class BuildChoiceField extends FieldSpec {++ private static final long serialVersionUID = 1L;++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return BuildChoiceInput.getPropertyDef(this, indexes);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return BuildChoiceInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return BuildChoiceInput.convertToStrings(value);+ }++ @Override+ public long getOrdinal(Object fieldValue) {+ if (fieldValue != null)+ return (Long) fieldValue;+ else+ return super.getOrdinal(fieldValue);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/ChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/ChoiceField.javanew file mode 100644index 0000000000..b0ef05e058--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/ChoiceField.java@@ -0,0 +1,106 @@+package io.onedev.server.model.support.issue.fieldspec;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.validation.Valid;+import javax.validation.constraints.NotNull;++import io.onedev.server.model.support.inputspec.choiceinput.ChoiceInput;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;+import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.EditContext;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.ShowCondition;++@Editable(order=145, name=FieldSpec.ENUMERATION)+public class ChoiceField extends FieldSpec {++ private static final long serialVersionUID = 1L;++ private ChoiceProvider choiceProvider = new SpecifiedChoices();++ private DefaultValueProvider defaultValueProvider;++ private DefaultMultiValueProvider defaultMultiValueProvider;++ @Editable(order=1000, name="Available Choices")+ @NotNull(message="may not be empty")+ @Valid+ public ChoiceProvider getChoiceProvider() {+ return choiceProvider;+ }++ public void setChoiceProvider(ChoiceProvider choiceProvider) {+ this.choiceProvider = choiceProvider;+ }++ @ShowCondition("isDefaultValueProviderVisible")+ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @SuppressWarnings("unused")+ private static boolean isDefaultValueProviderVisible() {+ return EditContext.get().getInputValue("allowMultiple").equals(false);+ }++ @ShowCondition("isDefaultMultiValueProviderVisible")+ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultMultiValueProvider getDefaultMultiValueProvider() {+ return defaultMultiValueProvider;+ }++ public void setDefaultMultiValueProvider(DefaultMultiValueProvider defaultMultiValueProvider) {+ this.defaultMultiValueProvider = defaultMultiValueProvider;+ }++ @SuppressWarnings("unused")+ private static boolean isDefaultMultiValueProviderVisible() {+ return EditContext.get().getInputValue("allowMultiple").equals(true);+ }++ @Override+ public List<String> getPossibleValues() {+ return ChoiceInput.getPossibleValues(choiceProvider);+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return ChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return ChoiceInput.convertToObject(this, strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return ChoiceInput.convertToStrings(this, value);+ }++ @Override+ public long getOrdinal(Object fieldValue) {+ if (fieldValue != null) {+ List<String> choices = new ArrayList<>(getChoiceProvider().getChoices(true).keySet());+ return choices.indexOf(fieldValue);+ } else {+ return super.getOrdinal(fieldValue);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/CommitField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/CommitField.javanew file mode 100644index 0000000000..059f59184e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/CommitField.java@@ -0,0 +1,35 @@+package io.onedev.server.model.support.issue.fieldspec;++import java.util.List;+import java.util.Map;++import io.onedev.server.model.support.inputspec.CommitInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=1400, name=FieldSpec.COMMIT)+public class CommitField extends FieldSpec {++ private static final long serialVersionUID = 1L;++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return CommitInput.getPropertyDef(this, indexes);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return CommitInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return CommitInput.convertToStrings(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/DateField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/DateField.javanew file mode 100644index 0000000000..c661cb615b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/DateField.java@@ -0,0 +1,61 @@+package io.onedev.server.model.support.issue.fieldspec;++import java.util.Date;+import java.util.List;+import java.util.Map;++import javax.validation.Valid;++import io.onedev.server.model.support.inputspec.dateinput.DateInput;+import io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;++@Editable(order=505, name=FieldSpec.DATE)+public class DateField extends FieldSpec {++ private static final long serialVersionUID = 1L;++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return DateInput.getPropertyDef(this, indexes, defaultValueProvider);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return DateInput.convertToObject(strings);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return DateInput.convertToStrings(value);+ }++ @Override+ public long getOrdinal(Object fieldValue) {+ if (fieldValue instanceof Date)+ return ((Date)fieldValue).getTime();+ else+ return super.getOrdinal(fieldValue);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.javanew file mode 100644index 0000000000..6e8fe13e53--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.java@@ -0,0 +1,119 @@+package io.onedev.server.model.support.issue.fieldspec;++import javax.validation.Valid;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;+import io.onedev.server.util.EditContext;+import io.onedev.server.util.usermatcher.Anyone;+import io.onedev.server.util.validation.annotation.FieldName;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.UserMatcher;++@Editable+public abstract class FieldSpec extends InputSpec {++ private static final long serialVersionUID = 1L;++ private String nameOfEmptyValue;++ private String canBeChangedBy = new Anyone().toString();++ @Editable(order=10)+ @FieldName+ @NotEmpty+ @Override+ public String getName() {+ return super.getName();+ }++ @Override+ public void setName(String name) {+ super.setName(name);+ }++ @Editable(order=30, description="Optionally describes the custom field")+ @NameOfEmptyValue("No description")+ @Override+ public String getDescription() {+ return super.getDescription();+ }++ @Override+ public void setDescription(String description) {+ super.setDescription(description);+ }++ @Editable(order=35, description="Whether or not multiple values can be specified for this field")+ @Override+ public boolean isAllowMultiple() {+ return super.isAllowMultiple();+ }++ @Override+ public void setAllowMultiple(boolean allowMultiple) {+ super.setAllowMultiple(allowMultiple);+ }++ @Editable(order=40, name="Show Conditionally", description="Enable if visibility of this field depends on other fields")+ @NameOfEmptyValue("Always")+ @Valid+ @Override+ public ShowCondition getShowCondition() {+ return super.getShowCondition();+ }++ @Override+ public void setShowCondition(ShowCondition showCondition) {+ super.setShowCondition(showCondition);+ }++ @Editable(order=50, name="Allow Empty Value", description="Whether or not this field accepts empty value")+ @Override+ public boolean isAllowEmpty() {+ return super.isAllowEmpty();+ }++ @Override+ public void setAllowEmpty(boolean allowEmpty) {+ super.setAllowEmpty(allowEmpty);+ }++ @Editable(order=60)+ @io.onedev.server.web.editable.annotation.ShowCondition("isNameOfEmptyValueVisible")+ @NotEmpty+ public String getNameOfEmptyValue() {+ return nameOfEmptyValue;+ }++ public void setNameOfEmptyValue(String nameOfEmptyValue) {+ this.nameOfEmptyValue = nameOfEmptyValue;+ }++ @Editable(order=65, description="This setting tells who can change this field")+ @UserMatcher+ @NotEmpty+ public String getCanBeChangedBy() {+ return canBeChangedBy;+ }++ public void setCanBeChangedBy(String canBeChangedBy) {+ this.canBeChangedBy = canBeChangedBy;+ }++ @SuppressWarnings("unused")+ private static boolean isNameOfEmptyValueVisible() {+ return (boolean) EditContext.get().getInputValue("allowEmpty");+ }++ @Override+ public void appendCommonAnnotations(StringBuffer buffer, int index) {+ super.appendCommonAnnotations(buffer, index);+ if (getNameOfEmptyValue() != null)+ buffer.append(" @NameOfEmptyValue(\"" + escape(getNameOfEmptyValue()) + "\")");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/GroupChoiceField.javasimilarity index 50%rename from server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.javarename to server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/GroupChoiceField.javaindex b2f9e6a30d..2ad81ad42f 100644--- a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/GroupChoiceField.java@@ -1,28 +1,22 @@-package io.onedev.server.util.inputspec.groupchoiceinput;+package io.onedev.server.model.support.issue.fieldspec;-import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;-import javax.validation.Validator;+import javax.validation.Valid;import javax.validation.constraints.NotNull;-import com.google.common.collect.Lists;--import io.onedev.server.OneDev;+import io.onedev.server.model.support.inputspec.groupchoiceinput.GroupChoiceInput;+import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.AllGroups;+import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.util.Usage;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.AllGroups;-import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-@Editable(order=160, name=InputSpec.GROUP)-public class GroupChoiceInput extends InputSpec {+@Editable(order=160, name=FieldSpec.GROUP)+public class GroupChoiceField extends FieldSpec {private static final long serialVersionUID = 1L;@@ -32,6 +26,7 @@ public class GroupChoiceInput extends InputSpec {@Editable(order=1000, name="Available Choices")@NotNull(message="may not be empty")+ @Validpublic ChoiceProvider getChoiceProvider() {return choiceProvider;}@@ -42,6 +37,7 @@ public class GroupChoiceInput extends InputSpec {@Editable(order=1100, name="Default Value")@NameOfEmptyValue("No default value")+ @Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;}@@ -52,26 +48,12 @@ public class GroupChoiceInput extends InputSpec {@Overridepublic List<String> getPossibleValues() {- List<String> possibleValues = new ArrayList<>();- if (OneDev.getInstance(Validator.class).validate(getChoiceProvider()).isEmpty()) {- for (GroupFacade group: getChoiceProvider().getChoices(true))- possibleValues.add(group.getName());- }- return possibleValues;+ return GroupChoiceInput.getPossibleValues(choiceProvider);}@Overridepublic String getPropertyDef(Map<String, Integer> indexes) {- int index = indexes.get(getName());- StringBuffer buffer = new StringBuffer();- appendField(buffer, index, "String");- appendCommonAnnotations(buffer, index);- if (!isAllowEmpty())- buffer.append(" @NotEmpty\n");- appendChoiceProvider(buffer, index, "@GroupChoice");- appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);-- return buffer.toString();+ return GroupChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider);}@Editable@@ -82,24 +64,15 @@ public class GroupChoiceInput extends InputSpec {@Overridepublic Object convertToObject(List<String> strings) {- if (strings.size() == 0)- return null;- else if (strings.size() == 1)- return strings.iterator().next();- else- throw new ValidationException("Not eligible for multi-value");+ return GroupChoiceInput.convertToObject(strings);}@Overridepublic List<String> convertToStrings(Object value) {- if (value instanceof String)- return Lists.newArrayList((String) value);- else- return new ArrayList<>();+ return GroupChoiceInput.convertToStrings(value);}- @Override- public void onRenameGroup(String oldName, String newName) {+ public void onRenameGroup(DefaultValueProvider defaultValueProvider, String oldName, String newName) {if (defaultValueProvider instanceof SpecifiedDefaultValue) {SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;if (specifiedDefaultValue.getValue().equals(oldName))@@ -107,8 +80,7 @@ public class GroupChoiceInput extends InputSpec {}}- @Override- public Usage onDeleteGroup(String groupName) {+ public Usage onDeleteGroup(DefaultValueProvider defaultValueProvider, String groupName) {if (defaultValueProvider instanceof SpecifiedDefaultValue) {SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;if (specifiedDefaultValue.getValue().equals(groupName))diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/IssueChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/IssueChoiceField.javanew file mode 100644index 0000000000..58c60b1cb4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/IssueChoiceField.java@@ -0,0 +1,43 @@+package io.onedev.server.model.support.issue.fieldspec;++import java.util.List;+import java.util.Map;++import io.onedev.server.model.support.inputspec.IssueChoiceInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=1100, name=FieldSpec.ISSUE)+public class IssueChoiceField extends FieldSpec {++ private static final long serialVersionUID = 1L;++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return IssueChoiceInput.getPropertyDef(this, indexes);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return IssueChoiceInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return IssueChoiceInput.convertToStrings(value);+ }++ @Override+ public long getOrdinal(Object fieldValue) {+ if (fieldValue != null)+ return (Long) fieldValue;+ else+ return super.getOrdinal(fieldValue);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/NumberField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/NumberField.javanew file mode 100644index 0000000000..d3425a53d2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/NumberField.java@@ -0,0 +1,82 @@+package io.onedev.server.model.support.issue.fieldspec;++import java.util.List;+import java.util.Map;++import javax.validation.Valid;++import io.onedev.server.model.support.inputspec.numberinput.NumberInput;+import io.onedev.server.model.support.inputspec.numberinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;++@Editable(order=400, name=FieldSpec.NUMBER)+public class NumberField extends FieldSpec {++ private static final long serialVersionUID = 1L;++ private Integer minValue;++ private Integer maxValue;++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, description="Optionally specify the minimum value allowed.")+ public Integer getMinValue() {+ return minValue;+ }++ public void setMinValue(Integer minValue) {+ this.minValue = minValue;+ }++ @Editable(order=1100, description="Optionally specify the maximum value allowed.")+ public Integer getMaxValue() {+ return maxValue;+ }++ public void setMaxValue(Integer maxValue) {+ this.maxValue = maxValue;+ }++ @Editable(order=1200, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return NumberInput.getPropertyDef(this, indexes, minValue, maxValue, defaultValueProvider);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return NumberInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return NumberInput.convertToStrings(value);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public long getOrdinal(Object fieldValue) {+ if (fieldValue != null)+ return (Integer)fieldValue;+ else+ return super.getOrdinal(fieldValue);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/PullRequestChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/PullRequestChoiceField.javanew file mode 100644index 0000000000..655821a4b0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/PullRequestChoiceField.java@@ -0,0 +1,43 @@+package io.onedev.server.model.support.issue.fieldspec;++import java.util.List;+import java.util.Map;++import io.onedev.server.model.support.inputspec.PullRequestChoiceInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=1000, name=FieldSpec.PULLREQUEST)+public class PullRequestChoiceField extends FieldSpec {++ private static final long serialVersionUID = 1L;++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return PullRequestChoiceInput.getPropertyDef(this, indexes);+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return PullRequestChoiceInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return PullRequestChoiceInput.convertToStrings(value);+ }++ @Override+ public long getOrdinal(Object fieldValue) {+ if (fieldValue != null)+ return (Long) fieldValue;+ else+ return super.getOrdinal(fieldValue);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/SecretField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/SecretField.javanew file mode 100644index 0000000000..03398af75e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/SecretField.java@@ -0,0 +1,41 @@+package io.onedev.server.model.support.issue.fieldspec;++import java.util.List;+import java.util.Map;++import io.onedev.server.model.support.inputspec.SecretInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=500, name=FieldSpec.SECRET)+public class SecretField extends FieldSpec {++ private static final long serialVersionUID = 1L;++ @Editable+ @Override+ public boolean isAllowEmpty() {+ return false;+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return SecretInput.getPropertyDef(this, indexes);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return SecretInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return SecretInput.convertToStrings(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/TextField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/TextField.javanew file mode 100644index 0000000000..f74d11f4c9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/TextField.java@@ -0,0 +1,75 @@+package io.onedev.server.model.support.issue.fieldspec;++import java.util.List;+import java.util.Map;++import javax.validation.Valid;++import io.onedev.server.model.support.inputspec.textinput.TextInput;+import io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;++@Editable(order=100, name=FieldSpec.TEXT)+public class TextField extends FieldSpec {++ private static final long serialVersionUID = 1L;++ private boolean multiline;++ private String pattern;++ private DefaultValueProvider defaultValueProvider;++ @Editable(order=1000, description="Enable for multi-line input")+ public boolean isMultiline() {+ return multiline;+ }++ public void setMultiline(boolean multiline) {+ this.multiline = multiline;+ }++ @Editable(order=1100, description="Optionally specify a <a href='http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html'>regular expression pattern</a> for valid values of " ++ "the text input")+ public String getPattern() {+ return pattern;+ }++ public void setPattern(String pattern) {+ this.pattern = pattern;+ }++ @Editable(order=1200, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultValueProvider getDefaultValueProvider() {+ return defaultValueProvider;+ }++ public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {+ this.defaultValueProvider = defaultValueProvider;+ }++ @Editable+ @Override+ public boolean isAllowMultiple() {+ return false;+ }++ @Override+ public String getPropertyDef(Map<String, Integer> indexes) {+ return TextInput.getPropertyDef(this, indexes, pattern, defaultValueProvider, multiline);+ }++ @Override+ public Object convertToObject(List<String> strings) {+ return TextInput.convertToObject(strings);+ }++ @Override+ public List<String> convertToStrings(Object value) {+ return TextInput.convertToStrings(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/UserChoiceField.javasimilarity index 60%rename from server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.javarename to server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/UserChoiceField.javaindex 8a99bcddc5..bff3a8595d 100644--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/UserChoiceField.java@@ -1,29 +1,27 @@-package io.onedev.server.util.inputspec.userchoiceinput;+package io.onedev.server.model.support.issue.fieldspec;-import java.util.ArrayList;import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.validation.ValidationException;+import javax.validation.Valid;import javax.validation.constraints.NotNull;-import com.google.common.collect.Lists;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.userchoiceinput.UserChoiceInput;+import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.GroupUsers;+import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.IssueReaders;+import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.util.Usage;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.GroupUsers;-import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.IssueReaders;-import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-@Editable(order=150, name=InputSpec.USER)-public class UserChoiceInput extends InputSpec {+@Editable(order=150, name=FieldSpec.USER)+public class UserChoiceField extends FieldSpec {private static final long serialVersionUID = 1L;@@ -33,6 +31,7 @@ public class UserChoiceInput extends InputSpec {@Editable(order=1000, name="Available Choices")@NotNull(message="may not be empty")+ @Validpublic ChoiceProvider getChoiceProvider() {return choiceProvider;}@@ -43,6 +42,7 @@ public class UserChoiceInput extends InputSpec {@Editable(order=1100, name="Default Value")@NameOfEmptyValue("No default value")+ @Validpublic DefaultValueProvider getDefaultValueProvider() {return defaultValueProvider;}@@ -58,16 +58,7 @@ public class UserChoiceInput extends InputSpec {@Overridepublic String getPropertyDef(Map<String, Integer> indexes) {- int index = indexes.get(getName());- StringBuffer buffer = new StringBuffer();- appendField(buffer, index, "String");- appendCommonAnnotations(buffer, index);- if (!isAllowEmpty())- buffer.append(" @NotEmpty\n");- appendChoiceProvider(buffer, index, "@UserChoice");- appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);-- return buffer.toString();+ return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider);}@Editable@@ -76,8 +67,7 @@ public class UserChoiceInput extends InputSpec {return false;}- @Override- public void onRenameUser(String oldName, String newName) {+ public void onRenameUser(DefaultValueProvider defaultValueProvider, String oldName, String newName) {if (defaultValueProvider instanceof SpecifiedDefaultValue) {SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;if (specifiedDefaultValue.getValue().equals(oldName))@@ -85,8 +75,7 @@ public class UserChoiceInput extends InputSpec {}}- @Override- public Usage onDeleteUser(String userName) {+ public Usage onDeleteUser(DefaultValueProvider defaultValueProvider, String userName) {if (defaultValueProvider instanceof SpecifiedDefaultValue) {SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;if (specifiedDefaultValue.getValue().equals(userName))@@ -95,8 +84,7 @@ public class UserChoiceInput extends InputSpec {return new Usage();}- @Override- public void onRenameGroup(String oldName, String newName) {+ public void onRenameGroup(ChoiceProvider choiceProvider, String oldName, String newName) {if (choiceProvider instanceof GroupUsers) {GroupUsers groupUsers = (GroupUsers) choiceProvider;if (groupUsers.getGroupName().equals(oldName))@@ -104,8 +92,7 @@ public class UserChoiceInput extends InputSpec {}}- @Override- public Usage onDeleteGroup(String groupName) {+ public Usage onDeleteGroup(InputSpec inputSpec, ChoiceProvider choiceProvider, String groupName) {Usage usage = new Usage();if (choiceProvider instanceof GroupUsers) {GroupUsers groupUsers = (GroupUsers) choiceProvider;@@ -117,20 +104,12 @@ public class UserChoiceInput extends InputSpec {@Overridepublic Object convertToObject(List<String> strings) {- if (strings.size() == 0)- return null;- else if (strings.size() == 1)- return strings.iterator().next();- else- throw new ValidationException("Not eligible for multi-value");+ return UserChoiceInput.convertToObject(strings);}@Overridepublic List<String> convertToStrings(Object value) {- if (value instanceof String)- return Lists.newArrayList((String) value);- else- return new ArrayList<>();+ return UserChoiceInput.convertToStrings(value);}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/TransitionPrerequisite.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/TransitionPrerequisite.javaindex 9c8d78601f..ee26c2b103 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/TransitionPrerequisite.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/TransitionPrerequisite.java@@ -8,7 +8,9 @@ import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.util.OneContext;+import com.google.common.base.Preconditions;++import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -46,7 +48,7 @@ public class TransitionPrerequisite implements Serializable {@SuppressWarnings("unused")private static List<String> getFieldNameChoices() {- return new ArrayList<>(OneContext.get().getInputContext().getInputNames());+ return new ArrayList<>(Preconditions.checkNotNull(InputContext.get()).getInputNames());}public boolean matches(List<String> values) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotAnyOf.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotAnyOf.javaindex b0f7e0d2c9..ab3e02e9e3 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotAnyOf.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotAnyOf.java@@ -7,10 +7,12 @@ import javax.validation.constraints.Size;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.google.common.base.Preconditions;import com.google.common.collect.Lists;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -39,13 +41,13 @@ public class ValueIsNotAnyOf implements ValueMatcher {@SuppressWarnings("unused")private static List<String> getValueChoices() {// Access on-screen value of ShowCondition.fiedName- String inputName = (String) OneContext.get().getEditContext(1).getInputValue("inputName");+ String inputName = (String) EditContext.get(1).getInputValue("inputName");if (inputName != null) {- InputSpec inputSpec = OneContext.get().getInputContext().getInputSpec(inputName);- if (inputSpec != null)- return inputSpec.getPossibleValues();+ InputSpec fieldSpec = Preconditions.checkNotNull(InputContext.get()).getInputSpec(inputName);+ if (fieldSpec != null)+ return fieldSpec.getPossibleValues();else- logger.error("Unable to find input spec: " + inputName);+ logger.error("Unable to find field spec: " + inputName);}return Lists.newArrayList();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.javaindex c2746f2048..e8b1bcdd2d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.java@@ -7,10 +7,12 @@ import javax.validation.constraints.Size;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.google.common.base.Preconditions;import com.google.common.collect.Lists;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -39,13 +41,13 @@ public class ValueIsOneOf implements ValueMatcher {@SuppressWarnings("unused")private static List<String> getValueChoices() {// Access on-screen value of ShowCondition.fiedName- String inputName = (String) OneContext.get().getEditContext(1).getInputValue("inputName");+ String inputName = (String) EditContext.get(1).getInputValue("inputName");if (inputName != null) {- InputSpec inputSpec = OneContext.get().getInputContext().getInputSpec(inputName);+ InputSpec inputSpec = Preconditions.checkNotNull(InputContext.get()).getInputSpec(inputName);if (inputSpec != null)return inputSpec.getPossibleValues();else- logger.error("Unable to find input spec: " + inputName);+ logger.error("Unable to find field spec: " + inputName);}return Lists.newArrayList();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.javaindex 8c24d3957d..dde6b71e48 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java@@ -1,13 +1,18 @@package io.onedev.server.model.support.issue.transitiontrigger;+import java.util.List;+import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.model.Project;import io.onedev.server.util.Usage;import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.web.editable.annotation.BranchPatterns;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.JobChoice;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;@Editable(order=400, name="Build fixing the issue is successful")public class BuildSuccessfulTrigger implements TransitionTrigger {@@ -31,7 +36,7 @@ public class BuildSuccessfulTrigger implements TransitionTrigger {@Editable(order=200, name="Applicable Branches", description="Optionally specify space-separated branches "+ "applicable for this trigger. Use * or ? for wildcard match")- @BranchPatterns+ @Patterns(suggester = "suggestBranches")@NameOfEmptyValue("All")public String getBranches() {return branches;@@ -41,6 +46,11 @@ public class BuildSuccessfulTrigger implements TransitionTrigger {this.branches = branches;}+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestBranches(String matchWith) {+ return SuggestionUtils.suggestBranches(Project.get(), matchWith);+ }+public Usage onDeleteBranch(String branchName) {Usage usage = new Usage();PatternSet patternSet = PatternSet.fromString(getBranches());diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.javaindex 6c3024afda..3e167fc745 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java@@ -9,9 +9,9 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@@ -66,7 +66,7 @@ public class PressButtonTrigger implements TransitionTrigger {private static List<String> getFieldChoices() {List<String> fields = new ArrayList<>();GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- for (InputSpec field: issueSetting.getFieldSpecs())+ for (FieldSpec field: issueSetting.getFieldSpecs())fields.add(field.getName());return fields;}diff --git a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.javaindex 44d442df00..4e7dd68624 100644--- a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java@@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.setting.MailSetting;+import io.onedev.server.model.support.administration.MailSetting;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;@@ -48,7 +48,7 @@ public class DefaultMailManager implements MailManager {}}- });+ }, null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/notification/MailManager.java b/server-core/src/main/java/io/onedev/server/notification/MailManager.javaindex c4c5dc1ddf..413b493fa2 100644--- a/server-core/src/main/java/io/onedev/server/notification/MailManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/MailManager.java@@ -2,7 +2,7 @@ package io.onedev.server.notification;import java.util.Collection;-import io.onedev.server.model.support.setting.MailSetting;+import io.onedev.server.model.support.administration.MailSetting;public interface MailManager {diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.javaindex 1601e69454..86f0981bb6 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java@@ -177,7 +177,7 @@ public class DefaultPersistManager implements PersistManager {if (tempFile != null)tempFile.delete();}-+sessionFactory = buildSessionFactory(metadata);idManager.init();diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.javaindex 059848e268..2afc122754 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.java@@ -3,8 +3,11 @@ package io.onedev.server.persistence;import java.util.concurrent.Callable;import java.util.concurrent.ExecutorService;+import javax.annotation.Nullable;import javax.inject.Provider;+import org.apache.shiro.subject.Subject;+import org.apache.shiro.util.ThreadContext;import org.hibernate.FlushMode;import org.hibernate.Session;import org.slf4j.Logger;@@ -105,16 +108,20 @@ public class DefaultSessionManager implements SessionManager {}@Override- public void runAsync(Runnable runnable) {+ public void runAsync(Runnable runnable, @Nullable Subject subject) {executorService.execute(new Runnable() {@Overridepublic void run() {try {+ if (subject != null)+ ThreadContext.bind(subject);DefaultSessionManager.this.run(runnable);} catch (Exception e) {+ if (subject != null)+ ThreadContext.unbindSubject();logger.error("Error running", e);- }+ }}});diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.javaindex 8a88632212..91a5db904a 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java@@ -28,6 +28,8 @@ import javax.persistence.FlushModeType;import javax.transaction.Status;import javax.transaction.Synchronization;+import org.apache.shiro.subject.Subject;+import org.apache.shiro.util.ThreadContext;import org.hibernate.Session;import org.hibernate.Transaction;import org.slf4j.Logger;@@ -135,7 +137,7 @@ public class DefaultTransactionManager implements TransactionManager {}@Transactional- public void runAsyncAfterCommit(Runnable runnable) {+ public void runAsyncAfterCommit(Runnable runnable, Subject subject) {runAfterCommit(new Runnable() {@Override@@ -145,9 +147,14 @@ public class DefaultTransactionManager implements TransactionManager {@Overridepublic void run() {try {+ if (subject != null)+ ThreadContext.bind(subject);runnable.run();} catch (Exception e) {logger.error("Error running", e);+ } finally {+ if (subject != null)+ ThreadContext.unbindSubject();}}diff --git a/server-core/src/main/java/io/onedev/server/persistence/SessionManager.java b/server-core/src/main/java/io/onedev/server/persistence/SessionManager.javaindex b6111913ee..df6d044ed6 100644--- a/server-core/src/main/java/io/onedev/server/persistence/SessionManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/SessionManager.java@@ -18,6 +18,7 @@ package io.onedev.server.persistence;import java.util.concurrent.Callable;+import org.apache.shiro.subject.Subject;import org.hibernate.Session;public interface SessionManager {@@ -30,7 +31,7 @@ public interface SessionManager {void run(Runnable runnable);- void runAsync(Runnable runnable);+ void runAsync(Runnable runnable, Subject subject);Session getSession();diff --git a/server-core/src/main/java/io/onedev/server/persistence/TransactionManager.java b/server-core/src/main/java/io/onedev/server/persistence/TransactionManager.javaindex 67e35e9074..bc1f18e513 100644--- a/server-core/src/main/java/io/onedev/server/persistence/TransactionManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/TransactionManager.java@@ -18,6 +18,9 @@ package io.onedev.server.persistence;import java.util.concurrent.Callable;+import javax.annotation.Nullable;++import org.apache.shiro.subject.Subject;import org.hibernate.Session;import org.hibernate.Transaction;@@ -41,7 +44,7 @@ public interface TransactionManager {*/void runAfterCommit(Runnable runnable);- void runAsyncAfterCommit(Runnable runnable);+ void runAsyncAfterCommit(Runnable runnable, @Nullable Subject subject);void mustRunAfterTransaction(Runnable runnable);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.javaindex 7998339b82..107b550d6f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java@@ -17,9 +17,9 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;public class ChoiceFieldCriteria extends FieldCriteria {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.javaindex d0060957b7..79e1369782 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java@@ -16,7 +16,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.util.IssueConstants;public abstract class FieldCriteria extends IssueCriteria {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 2fef56af63..71bb26f06d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -39,7 +39,18 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.fieldspec.BooleanField;+import io.onedev.server.model.support.issue.fieldspec.BuildChoiceField;+import io.onedev.server.model.support.issue.fieldspec.ChoiceField;+import io.onedev.server.model.support.issue.fieldspec.DateField;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.fieldspec.GroupChoiceField;+import io.onedev.server.model.support.issue.fieldspec.IssueChoiceField;+import io.onedev.server.model.support.issue.fieldspec.NumberField;+import io.onedev.server.model.support.issue.fieldspec.PullRequestChoiceField;+import io.onedev.server.model.support.issue.fieldspec.TextField;+import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;@@ -58,17 +69,6 @@ import io.onedev.server.search.entity.issue.IssueQueryParser.QueryContext;import io.onedev.server.search.entity.issue.IssueQueryParser.RevisionCriteriaContext;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.util.inputspec.BuildChoiceInput;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.IssueChoiceInput;-import io.onedev.server.util.inputspec.PullRequestChoiceInput;-import io.onedev.server.util.inputspec.booleaninput.BooleanInput;-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;-import io.onedev.server.util.inputspec.dateinput.DateInput;-import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;-import io.onedev.server.util.inputspec.numberinput.NumberInput;-import io.onedev.server.util.inputspec.textinput.TextInput;-import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;import io.onedev.server.web.util.WicketUtils;@@ -131,7 +131,7 @@ public class IssueQuery extends EntityQuery<Issue> {if (criteriaContext != null) {issueCriteria = new IssueQueryBaseVisitor<IssueCriteria>() {- private long getValueOrdinal(ChoiceInput field, String value) {+ private long getValueOrdinal(ChoiceField field, String value) {List<String> choices = new ArrayList<>(field.getChoiceProvider().getChoices(true).keySet());return choices.indexOf(value);}@@ -234,13 +234,13 @@ public class IssueQuery extends EntityQuery<Issue> {} else if (fieldName.equals(FIELD_COMMENT)) {return new CommentCriteria(value);} else {- InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);- if (fieldSpec instanceof TextInput) {+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);+ if (fieldSpec instanceof TextField) {return new StringFieldCriteria(fieldName, value, operator);} else {long ordinal;if (validate)- ordinal = getValueOrdinal((ChoiceInput) fieldSpec, value);+ ordinal = getValueOrdinal((ChoiceField) fieldSpec, value);elseordinal = 0;return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, true);@@ -258,22 +258,22 @@ public class IssueQuery extends EntityQuery<Issue> {} else if (fieldName.equals(FIELD_NUMBER)) {return new NumberCriteria(getIntValue(value), operator);} else {- InputSpec field = getIssueSetting().getFieldSpec(fieldName);- if (field instanceof IssueChoiceInput || field instanceof BuildChoiceInput- || field instanceof PullRequestChoiceInput) {+ FieldSpec field = getIssueSetting().getFieldSpec(fieldName);+ if (field instanceof IssueChoiceField || field instanceof BuildChoiceField+ || field instanceof PullRequestChoiceField) {value = value.trim();if (value.startsWith("#"))value = value.substring(1);return new ReferenceableFieldCriteria(fieldName, getIntValue(value));- } else if (field instanceof BooleanInput) {+ } else if (field instanceof BooleanField) {return new BooleanFieldCriteria(fieldName, getBooleanValue(value));- } else if (field instanceof NumberInput) {+ } else if (field instanceof NumberField) {return new NumericFieldCriteria(fieldName, getIntValue(value), operator);- } else if (field instanceof ChoiceInput) {- long ordinal = getValueOrdinal((ChoiceInput) field, value);+ } else if (field instanceof ChoiceField) {+ long ordinal = getValueOrdinal((ChoiceField) field, value);return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false);- } else if (field instanceof UserChoiceInput- || field instanceof GroupChoiceInput) {+ } else if (field instanceof UserChoiceField+ || field instanceof GroupChoiceField) {return new ChoiceFieldCriteria(fieldName, value, -1, operator, false);} else {return new StringFieldCriteria(fieldName, value, operator);@@ -288,13 +288,13 @@ public class IssueQuery extends EntityQuery<Issue> {} else if (fieldName.equals(FIELD_NUMBER)) {return new NumberCriteria(getIntValue(value), operator);} else {- InputSpec field = getIssueSetting().getFieldSpec(fieldName);- if (field instanceof NumberInput) {+ FieldSpec field = getIssueSetting().getFieldSpec(fieldName);+ if (field instanceof NumberField) {return new NumericFieldCriteria(fieldName, getIntValue(value), operator);} else {long ordinal;if (validate)- ordinal = getValueOrdinal((ChoiceInput) field, value);+ ordinal = getValueOrdinal((ChoiceField) field, value);elseordinal = 0;return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false);@@ -335,9 +335,9 @@ public class IssueQuery extends EntityQuery<Issue> {for (OrderContext order: queryContext.order()) {String fieldName = getValue(order.Quoted().getText());if (validate && !IssueConstants.ORDER_FIELDS.containsKey(fieldName)) {- InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);- if (!(fieldSpec instanceof ChoiceInput) && !(fieldSpec instanceof DateInput)- && !(fieldSpec instanceof NumberInput)) {+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);+ if (!(fieldSpec instanceof ChoiceField) && !(fieldSpec instanceof DateField)+ && !(fieldSpec instanceof NumberField)) {throw new OneException("Can not order by field: " + fieldName);}}@@ -369,7 +369,7 @@ public class IssueQuery extends EntityQuery<Issue> {}public static void checkField(String fieldName, int operator) {- InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);if (fieldSpec == null && !IssueConstants.QUERY_FIELDS.contains(fieldName))throw new OneException("Field not found: " + fieldName);switch (operator) {@@ -378,19 +378,19 @@ public class IssueQuery extends EntityQuery<Issue> {throw newOperatorException(fieldName, operator);break;case IssueQueryLexer.IsMe:- if (!(fieldSpec instanceof UserChoiceInput))+ if (!(fieldSpec instanceof UserChoiceField))throw newOperatorException(fieldName, operator);break;case IssueQueryLexer.IsBefore:case IssueQueryLexer.IsAfter:- if (!fieldName.equals(FIELD_SUBMIT_DATE) && !fieldName.equals(FIELD_UPDATE_DATE) && !(fieldSpec instanceof DateInput))+ if (!fieldName.equals(FIELD_SUBMIT_DATE) && !fieldName.equals(FIELD_UPDATE_DATE) && !(fieldSpec instanceof DateField))throw newOperatorException(fieldName, operator);break;case IssueQueryLexer.Contains:if (!fieldName.equals(FIELD_TITLE)&& !fieldName.equals(FIELD_DESCRIPTION)&& !fieldName.equals(FIELD_COMMENT)- && !(fieldSpec instanceof TextInput)+ && !(fieldSpec instanceof TextField)&& !(fieldSpec != null && fieldSpec.isAllowMultiple())) {throw newOperatorException(fieldName, operator);}@@ -401,15 +401,15 @@ public class IssueQuery extends EntityQuery<Issue> {&& !fieldName.equals(FIELD_COMMENT_COUNT)&& !fieldName.equals(FIELD_NUMBER)&& !fieldName.equals(FIELD_MILESTONE)- && !(fieldSpec instanceof IssueChoiceInput)- && !(fieldSpec instanceof PullRequestChoiceInput)- && !(fieldSpec instanceof BuildChoiceInput)- && !(fieldSpec instanceof BooleanInput)- && !(fieldSpec instanceof NumberInput)- && !(fieldSpec instanceof ChoiceInput)- && !(fieldSpec instanceof UserChoiceInput)- && !(fieldSpec instanceof GroupChoiceInput)- && !(fieldSpec instanceof TextInput)) {+ && !(fieldSpec instanceof IssueChoiceField)+ && !(fieldSpec instanceof PullRequestChoiceField)+ && !(fieldSpec instanceof BuildChoiceField)+ && !(fieldSpec instanceof BooleanField)+ && !(fieldSpec instanceof NumberField)+ && !(fieldSpec instanceof ChoiceField)+ && !(fieldSpec instanceof UserChoiceField)+ && !(fieldSpec instanceof GroupChoiceField)+ && !(fieldSpec instanceof TextField)) {throw newOperatorException(fieldName, operator);}break;@@ -418,8 +418,8 @@ public class IssueQuery extends EntityQuery<Issue> {if (!fieldName.equals(FIELD_VOTE_COUNT)&& !fieldName.equals(FIELD_COMMENT_COUNT)&& !fieldName.equals(FIELD_NUMBER)- && !(fieldSpec instanceof NumberInput)- && !(fieldSpec instanceof ChoiceInput))+ && !(fieldSpec instanceof NumberField)+ && !(fieldSpec instanceof ChoiceField))throw newOperatorException(fieldName, operator);break;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.javaindex fd3fc1928d..fa513888dd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java@@ -12,9 +12,9 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.setting.GlobalIssueSetting;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;public class MineCriteria extends IssueCriteria {@@ -24,8 +24,8 @@ public class MineCriteria extends IssueCriteria {IssueCriteria submitterCriteria = new SubmittedByCriteria(user, user.getName());List<IssueCriteria> fieldCriterias = new ArrayList<>();GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- for (InputSpec field: issueSetting.getFieldSpecs()) {- if (field instanceof UserChoiceInput) {+ for (FieldSpec field: issueSetting.getFieldSpecs()) {+ if (field instanceof UserChoiceField) {IssueCriteria fieldCriteria = new FieldOperatorCriteria(field.getName(), IssueQueryLexer.IsMe);fieldCriterias.add(fieldCriteria);}diff --git a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javaindex b6b99f7e52..37d2991f0b 100644--- a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java@@ -33,8 +33,8 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Group;import io.onedev.server.model.Membership;import io.onedev.server.model.User;-import io.onedev.server.model.support.authenticator.Authenticated;-import io.onedev.server.model.support.authenticator.Authenticator;+import io.onedev.server.model.support.administration.authenticator.Authenticated;+import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.security.permission.CreateProjects;import io.onedev.server.security.permission.ProjectPermission;diff --git a/server-core/src/main/java/io/onedev/server/util/CommitAware.java b/server-core/src/main/java/io/onedev/server/util/CommitAware.javanew file mode 100644index 0000000000..a3eb01ff71--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/CommitAware.java@@ -0,0 +1,9 @@+package io.onedev.server.util;++import org.eclipse.jgit.lib.ObjectId;++public interface CommitAware {++ ObjectId getCommitId();++}diff --git a/server-core/src/main/java/io/onedev/server/util/ComponentContext.java b/server-core/src/main/java/io/onedev/server/util/ComponentContext.javanew file mode 100644index 0000000000..b5763fb0ce--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/ComponentContext.java@@ -0,0 +1,56 @@+package io.onedev.server.util;++import java.util.Stack;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.Page;++import io.onedev.server.web.util.WicketUtils;++public class ComponentContext {++ private static ThreadLocal<Stack<ComponentContext>> stack = new ThreadLocal<Stack<ComponentContext>>() {++ @Override+ protected Stack<ComponentContext> initialValue() {+ return new Stack<ComponentContext>();+ }++ };++ private Component component;++ public ComponentContext(Component component) {+ this.component = component;+ }++ public static void push(ComponentContext context) {+ stack.get().push(context);+ }++ public static void pop() {+ stack.get().pop();+ }++ @Nullable+ public static ComponentContext get() {+ if (!stack.get().isEmpty()) {+ return stack.get().peek();+ } else {+ Page page = WicketUtils.getPage();+ return page!=null? new ComponentContext(page): null;+ }+ }++ public Component getComponent() {+ return component;+ }++ @Nullable+ public ComponentContext getChildContext(String childName) {+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/EditContext.java b/server-core/src/main/java/io/onedev/server/util/EditContext.javaindex 585b335022..35fba97eef 100644--- a/server-core/src/main/java/io/onedev/server/util/EditContext.java+++ b/server-core/src/main/java/io/onedev/server/util/EditContext.java@@ -1,7 +1,27 @@package io.onedev.server.util;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.web.util.WicketUtils;+public interface EditContext {Object getInputValue(String name);+ public static EditContext get(int level) {+ return list().get(level);+ }++ public static EditContext get() {+ return get(0);+ }++ public static List<EditContext> list() {+ ComponentContext componentContext = ComponentContext.get();+ if (componentContext != null)+ return WicketUtils.findParents(componentContext.getComponent(), EditContext.class);+ else+ return new ArrayList<>();+ }}diff --git a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.javaindex cd20513b95..f83ca28cd4 100644--- a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java@@ -3,14 +3,25 @@ package io.onedev.server.util;import java.util.HashMap;import java.util.Map;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import com.google.common.collect.MapMaker;import groovy.lang.Binding;import groovy.lang.GroovyClassLoader;import groovy.lang.Script;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.OneException;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.groovyscript.GroovyScript;+import io.onedev.server.util.scriptidentity.ScriptIdentity;public class GroovyUtils {+ private static final Logger logger = LoggerFactory.getLogger(GroovyUtils.class);+private static Map<String, Class<?>> scriptClassCache = new MapMaker().weakValues().makeMap();public static Class<?> compile(String script) {@@ -27,8 +38,8 @@ public class GroovyUtils {@Overridepublic Object getVariable(String name) {- if (name.equals("onedev"))- return OneContext.get();+ if (name.equals("logger"))+ return logger;else if (variables.containsKey(name))return variables.get(name);else@@ -43,9 +54,21 @@ public class GroovyUtils {};}- public static Object evalScript(String scriptText, Map<String, Object> variables) {+ public static Object evalScriptByName(String scriptName) {+ return evalScriptByName(scriptName, new HashMap<>());+ }++ public static Object evalScriptByName(String scriptName, Map<String, Object> variables) {+ for (GroovyScript script: OneDev.getInstance(SettingManager.class).getGroovyScripts()) {+ if (script.getName().equals(scriptName) && script.isAuthorized(ScriptIdentity.get()))+ return evalScript(StringUtils.join(script.getContent(), "\n"), variables);+ }+ throw new OneException("No authorized groovy script found: " + scriptName);+ }++ public static Object evalScript(String scriptContent, Map<String, Object> variables) {try {- Class<?> scriptClass = compile(scriptText);+ Class<?> scriptClass = compile(scriptContent);Script script;try {Object instance = scriptClass.newInstance();@@ -59,12 +82,12 @@ public class GroovyUtils {script.setBinding(getBinding(variables));return script.run();} catch (RuntimeException e) {- throw new ScriptException(scriptText, e);+ throw new ScriptException(scriptContent, e);}}- public static Object evalScript(String scriptText) {- return evalScript(scriptText, new HashMap<>());+ public static Object evalScript(String scriptContent) {+ return evalScript(scriptContent, new HashMap<>());}-}+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/util/Input.java b/server-core/src/main/java/io/onedev/server/util/Input.javaindex 55875853c1..e60dc71cda 100644--- a/server-core/src/main/java/io/onedev/server/util/Input.java+++ b/server-core/src/main/java/io/onedev/server/util/Input.java@@ -13,8 +13,9 @@ import org.slf4j.LoggerFactory;import com.thoughtworks.xstream.annotations.XStreamOmitField;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.inputspec.SecretInput;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;public class Input implements Serializable {@@ -74,17 +75,21 @@ public class Input implements Serializable {@Nullablepublic Object getTypedValue(@Nullable InputSpec inputSpec) {- try {- return inputSpec.convertToObject(getValues());- } catch (ValidationException e) {- String displayValue;- if (type.equals(InputSpec.SECRET))- displayValue = SecretInput.MASK;- else- displayValue = "" + getValues();-- logger.error("Error converting field value (field: {}, value: {}, error: {})",- getName(), displayValue, e.getMessage());+ if (inputSpec != null) {+ try {+ return inputSpec.convertToObject(getValues());+ } catch (ValidationException e) {+ String displayValue;+ if (type.equals(FieldSpec.SECRET))+ displayValue = SecretInput.MASK;+ else+ displayValue = "" + getValues();++ logger.error("Error converting field value (field: {}, value: {}, error: {})",+ getName(), displayValue, e.getMessage());+ return null;+ }+ } else {return null;}}diff --git a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java b/server-core/src/main/java/io/onedev/server/util/IssueUtils.javaindex 74ef5c4614..102ab4c02d 100644--- a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java@@ -24,8 +24,8 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.setting.GlobalIssueSetting;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;@@ -47,7 +47,7 @@ public class IssueUtils {public static Class<? extends Serializable> defineFieldBeanClass(Project project) {String className = FIELD_BEAN_PREFIX + project.getId();GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- return (Class<? extends Serializable>) InputSpec.defineClass(className, "Issue Fields", issueSetting.getFieldSpecs());+ return (Class<? extends Serializable>) FieldSpec.defineClass(className, "Issue Fields", issueSetting.getFieldSpecs());}@Nullable@@ -68,7 +68,7 @@ public class IssueUtils {for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBeanClass).getProperties().values()) {for (PropertyDescriptor property: groupProperties) {if (fieldNames.contains(property.getDisplayName())) {- InputSpec field = settingManager.getIssueSetting().getFieldSpec(property.getDisplayName());+ FieldSpec field = settingManager.getIssueSetting().getFieldSpec(property.getDisplayName());if (field != null && UserMatcher.fromString(field.getCanBeChangedBy()).matches(project, user))propertyNames.add(property.getPropertyName());}@@ -77,8 +77,8 @@ public class IssueUtils {return propertyNames;}- public static Map<String, Object> getFieldValues(OneContext context, Serializable fieldBean, Collection<String> fieldNames) {- OneContext.push(context);+ public static Map<String, Object> getFieldValues(ComponentContext context, Serializable fieldBean, Collection<String> fieldNames) {+ ComponentContext.push(context);try {Map<String, Object> fieldValues = new HashMap<>();BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());@@ -91,7 +91,7 @@ public class IssueUtils {return fieldValues;} finally {- OneContext.pop();+ ComponentContext.pop();}}diff --git a/server-core/src/main/java/io/onedev/server/util/OneContext.java b/server-core/src/main/java/io/onedev/server/util/OneContext.javadeleted file mode 100644index f8b2e4ff5b..0000000000--- a/server-core/src/main/java/io/onedev/server/util/OneContext.java+++ /dev/null@@ -1,88 +0,0 @@-package io.onedev.server.util;--import java.util.Stack;--import javax.annotation.Nullable;--import org.apache.wicket.Component;--import com.google.common.base.Preconditions;--import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.server.OneDev;-import io.onedev.server.model.Project;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.web.util.ProjectAware;-import io.onedev.server.web.util.WicketUtils;--public class OneContext {-- private static ThreadLocal<Stack<OneContext>> stack = new ThreadLocal<Stack<OneContext>>() {-- @Override- protected Stack<OneContext> initialValue() {- return new Stack<OneContext>();- }-- };-- private Component component;-- public OneContext(Component component) {- this.component = component;- }-- public static void push(OneContext context) {- stack.get().push(context);- }-- public static void pop() {- stack.get().pop();- }-- @Nullable- public static OneContext get() {- if (!stack.get().isEmpty())- return stack.get().peek();- else- return null;- }-- public <T> T getInstance(Class<T> type) {- return AppLoader.getInstance(type);- }-- public String getDocLink() {- return OneDev.getInstance().getDocRoot();- }-- public EditContext getEditContext() {- return getEditContext(0);- }-- public Project getProject() {- ProjectAware projectAware = component.findParent(ProjectAware.class);- if (projectAware != null)- return projectAware.getProject();- else- return null;- }-- public EditContext getEditContext(int level) {- return WicketUtils.findParents(getComponent(), EditContext.class).get(level);- }-- public InputContext getInputContext() {- return Preconditions.checkNotNull(WicketUtils.findInnermost(component, InputContext.class));- }-- public Component getComponent() {- return component;- }-- @Nullable- public OneContext getPropertyContext(String propertyName) {- return null;- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.javadeleted file mode 100644index 46fc3fb4ec..0000000000--- a/server-core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java+++ /dev/null@@ -1,70 +0,0 @@-package io.onedev.server.util.inputspec;--import java.util.ArrayList;-import java.util.List;-import java.util.Map;--import javax.validation.ValidationException;--import com.google.common.collect.Lists;--import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=1200, name=InputSpec.BUILD)-public class BuildChoiceInput extends InputSpec {-- private static final long serialVersionUID = 1L;-- @Override- public String getPropertyDef(Map<String, Integer> indexes) {- int index = indexes.get(getName());- StringBuffer buffer = new StringBuffer();- appendField(buffer, index, "Long");- appendCommonAnnotations(buffer, index);- if (!isAllowEmpty())- buffer.append(" @NotNull\n");- buffer.append(" @BuildChoice\n");- appendMethods(buffer, index, "Long", null, null);-- return buffer.toString();- }-- @Editable- @Override- public boolean isAllowMultiple() {- return false;- }-- @Override- public Object convertToObject(List<String> strings) {- if (strings.size() == 0) {- return null;- } else if (strings.size() == 1) {- String value = strings.iterator().next();- try {- return Long.valueOf(value);- } catch (NumberFormatException e) {- throw new ValidationException("Invalid build number");- }- } else {- throw new ValidationException("Not eligible for multi-value");- }- }-- @Override- public List<String> convertToStrings(Object value) {- if (value instanceof Long)- return Lists.newArrayList((String) value);- else- return new ArrayList<>();- }-- @Override- public long getOrdinal(Object fieldValue) {- if (fieldValue != null)- return (Long) fieldValue;- else- return super.getOrdinal(fieldValue);- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/InputContext.java b/server-core/src/main/java/io/onedev/server/util/inputspec/InputContext.javadeleted file mode 100644index fd7c5f7253..0000000000--- a/server-core/src/main/java/io/onedev/server/util/inputspec/InputContext.java+++ /dev/null@@ -1,17 +0,0 @@-package io.onedev.server.util.inputspec;--import java.util.List;--import javax.annotation.Nullable;--public interface InputContext {-- List<String> getInputNames();-- @Nullable- InputSpec getInputSpec(String inputName);-- void validateName(String inputName);--}-\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.javadeleted file mode 100644index 6511e3ff67..0000000000--- a/server-core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.java+++ /dev/null@@ -1,70 +0,0 @@-package io.onedev.server.util.inputspec;--import java.util.ArrayList;-import java.util.List;-import java.util.Map;--import javax.validation.ValidationException;--import com.google.common.collect.Lists;--import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=1100, name=InputSpec.ISSUE)-public class IssueChoiceInput extends InputSpec {-- private static final long serialVersionUID = 1L;-- @Override- public String getPropertyDef(Map<String, Integer> indexes) {- int index = indexes.get(getName());- StringBuffer buffer = new StringBuffer();- appendField(buffer, index, "Long");- appendCommonAnnotations(buffer, index);- if (!isAllowEmpty())- buffer.append(" @NotNull\n");- buffer.append(" @IssueChoice\n");- appendMethods(buffer, index, "Long", null, null);-- return buffer.toString();- }-- @Editable- @Override- public boolean isAllowMultiple() {- return false;- }-- @Override- public Object convertToObject(List<String> strings) {- if (strings.size() == 0) {- return null;- } else if (strings.size() == 1) {- String value = strings.iterator().next();- try {- return Long.valueOf(value);- } catch (NumberFormatException e) {- throw new ValidationException("Invalid issue number");- }- } else {- throw new ValidationException("Not eligible for multi-value");- }- }-- @Override- public List<String> convertToStrings(Object value) {- if (value instanceof Long)- return Lists.newArrayList((String) value);- else- return new ArrayList<>();- }-- @Override- public long getOrdinal(Object fieldValue) {- if (fieldValue != null)- return (Long) fieldValue;- else- return super.getOrdinal(fieldValue);- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.javadeleted file mode 100644index 24609e5754..0000000000--- a/server-core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.java+++ /dev/null@@ -1,70 +0,0 @@-package io.onedev.server.util.inputspec;--import java.util.ArrayList;-import java.util.List;-import java.util.Map;--import javax.validation.ValidationException;--import com.google.common.collect.Lists;--import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=1000, name=InputSpec.PULLREQUEST)-public class PullRequestChoiceInput extends InputSpec {-- private static final long serialVersionUID = 1L;-- @Override- public String getPropertyDef(Map<String, Integer> indexes) {- int index = indexes.get(getName());- StringBuffer buffer = new StringBuffer();- appendField(buffer, index, "Long");- appendCommonAnnotations(buffer, index);- if (!isAllowEmpty())- buffer.append(" @NotNull\n");- buffer.append(" @PullRequestChoice\n");- appendMethods(buffer, index, "Long", null, null);-- return buffer.toString();- }-- @Editable- @Override- public boolean isAllowMultiple() {- return false;- }-- @Override- public Object convertToObject(List<String> strings) {- if (strings.size() == 0) {- return null;- } else if (strings.size() == 1) {- String value = strings.iterator().next();- try {- return Long.valueOf(value);- } catch (NumberFormatException e) {- throw new ValidationException("Invalid pull request number");- }- } else {- throw new ValidationException("Not eligible for multi-value");- }- }-- @Override- public List<String> convertToStrings(Object value) {- if (value instanceof Long)- return Lists.newArrayList((String) value);- else- return new ArrayList<>();- }-- @Override- public long getOrdinal(Object fieldValue) {- if (fieldValue != null)- return (Long) fieldValue;- else- return super.getOrdinal(fieldValue);- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/SecretInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/SecretInput.javadeleted file mode 100644index 12a96032b2..0000000000--- a/server-core/src/main/java/io/onedev/server/util/inputspec/SecretInput.java+++ /dev/null@@ -1,65 +0,0 @@-package io.onedev.server.util.inputspec;--import java.util.ArrayList;-import java.util.List;-import java.util.Map;--import javax.validation.ValidationException;--import com.google.common.collect.Lists;--import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=500, name=InputSpec.SECRET)-public class SecretInput extends InputSpec {-- private static final long serialVersionUID = 1L;-- public static final String MASK = "*****";-- public static final String LITERAL_VALUE_PREFIX = "$OneDev-Secret-Literal$";-- @Editable- @Override- public boolean isAllowEmpty() {- return false;- }-- @Editable- @Override- public boolean isAllowMultiple() {- return false;- }-- @Override- public String getPropertyDef(Map<String, Integer> indexes) {- int index = indexes.get(getName());- StringBuffer buffer = new StringBuffer();- appendField(buffer, index, "String");- appendCommonAnnotations(buffer, index);- buffer.append(" @NotEmpty\n");- buffer.append(" @Password\n");- appendMethods(buffer, index, "String", null, null);-- return buffer.toString();- }-- @Override- public Object convertToObject(List<String> strings) {- if (strings.size() == 0)- return null;- else if (strings.size() == 1)- return strings.iterator().next();- else- throw new ValidationException("Not eligible for multi-value");- }-- @Override- public List<String> convertToStrings(Object value) {- if (value instanceof String)- return Lists.newArrayList((String)value);- else- return new ArrayList<>();- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.javadeleted file mode 100644index 933067a948..0000000000--- a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java+++ /dev/null@@ -1,89 +0,0 @@-package io.onedev.server.util.inputspec.booleaninput;--import java.util.List;-import java.util.Map;--import javax.validation.ValidationException;-import javax.validation.constraints.NotNull;--import com.google.common.collect.Lists;--import io.onedev.commons.utils.StringUtils;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider.FalseDefaultValue;-import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=300, name=InputSpec.BOOLEAN)-public class BooleanInput extends InputSpec {-- private static final long serialVersionUID = 1L;-- private DefaultValueProvider defaultValueProvider = new FalseDefaultValue();-- @Editable(name="Default Value", order=1000)- @NotNull(message="may not be empty")- public DefaultValueProvider getDefaultValueProvider() {- return defaultValueProvider;- }-- public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {- this.defaultValueProvider = defaultValueProvider;- }-- @Editable- @Override- public boolean isAllowMultiple() {- return false;- }-- @Override- public List<String> getPossibleValues() {- return Lists.newArrayList(StringUtils.describe(true), StringUtils.describe(false));- }-- @Editable- @Override- public boolean isAllowEmpty() {- return false;- }-- @Override- public String getPropertyDef(Map<String, Integer> indexes) {- int index = indexes.get(getName());-- StringBuffer buffer = new StringBuffer();- appendField(buffer, index, "Boolean");- appendCommonAnnotations(buffer, index);- buffer.append(" @NotNull(message=\"May not be empty\")\n");- appendMethods(buffer, index, "Boolean", null, defaultValueProvider);-- return buffer.toString();- }-- @Override- public Object convertToObject(List<String> strings) {- if (strings.size() == 0) {- throw new ValidationException("Invalid boolean value");- } else if (strings.size() == 1) {- String string = strings.iterator().next();- if (string.equalsIgnoreCase("true") || string.equalsIgnoreCase(StringUtils.describe(true)))- return true;- else if (string.equalsIgnoreCase("false") || string.equalsIgnoreCase(StringUtils.describe(false)))- return false;- else- throw new ValidationException("Invalid boolean value");- } else {- throw new ValidationException("Not eligible for multi-value");- }- }-- @Override- public List<String> convertToStrings(Object value) {- if (value instanceof Boolean)- return Lists.newArrayList(StringUtils.describe((Boolean)value));- else- return Lists.newArrayList(StringUtils.describe(false));- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.javadeleted file mode 100644index ffd7ec2bfe..0000000000--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java+++ /dev/null@@ -1,162 +0,0 @@-package io.onedev.server.util.inputspec.choiceinput;--import java.util.ArrayList;-import java.util.List;-import java.util.Map;--import javax.validation.ValidationException;-import javax.validation.Validator;-import javax.validation.constraints.NotNull;--import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.server.OneDev;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;-import io.onedev.server.util.inputspec.choiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;-import io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.ShowCondition;--@Editable(order=145, name=InputSpec.ENUMERATION)-public class ChoiceInput extends InputSpec {-- private static final long serialVersionUID = 1L;-- private ChoiceProvider choiceProvider = new SpecifiedChoices();-- private DefaultValueProvider defaultValueProvider;-- private DefaultMultiValueProvider defaultMultiValueProvider;-- @Editable(order=1000, name="Available Choices")- @NotNull(message="may not be empty")- public ChoiceProvider getChoiceProvider() {- return choiceProvider;- }-- public void setChoiceProvider(ChoiceProvider choiceProvider) {- this.choiceProvider = choiceProvider;- }-- @ShowCondition("isDefaultValueProviderVisible")- @Editable(order=1100, name="Default Value")- @NameOfEmptyValue("No default value")- public DefaultValueProvider getDefaultValueProvider() {- return defaultValueProvider;- }-- public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {- this.defaultValueProvider = defaultValueProvider;- }-- @SuppressWarnings("unused")- private static boolean isDefaultValueProviderVisible() {- return OneContext.get().getEditContext().getInputValue("allowMultiple").equals(false);- }-- @ShowCondition("isDefaultMultiValueProviderVisible")- @Editable(order=1100, name="Default Value")- @NameOfEmptyValue("No default value")- public DefaultMultiValueProvider getDefaultMultiValueProvider() {- return defaultMultiValueProvider;- }-- public void setDefaultMultiValueProvider(DefaultMultiValueProvider defaultMultiValueProvider) {- this.defaultMultiValueProvider = defaultMultiValueProvider;- }-- @SuppressWarnings("unused")- private static boolean isDefaultMultiValueProviderVisible() {- return OneContext.get().getEditContext().getInputValue("allowMultiple").equals(true);- }-- @Override- public List<String> getPossibleValues() {- List<String> possibleValues = new ArrayList<>();- if (OneDev.getInstance(Validator.class).validate(getChoiceProvider()).isEmpty())- possibleValues.addAll(getChoiceProvider().getChoices(true).keySet());- return possibleValues;- }-- @Override- public String getPropertyDef(Map<String, Integer> indexes) {- int index = indexes.get(getName());- StringBuffer buffer = new StringBuffer();- appendField(buffer, index, isAllowMultiple()? "List<String>": "String");- appendCommonAnnotations(buffer, index);- if (!isAllowEmpty()) {- if (isAllowMultiple())- buffer.append(" @Size(min=1, message=\"At least one option needs to be selected\")\n");- else- buffer.append(" @NotEmpty\n");- }- appendChoiceProvider(buffer, index, "@ChoiceProvider");-- if (isAllowMultiple())- appendMethods(buffer, index, "List<String>", choiceProvider, defaultMultiValueProvider);- else- appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);-- return buffer.toString();- }-- @Override- public Object convertToObject(List<String> strings) {- if (isAllowMultiple()) {- List<String> possibleValues = getPossibleValues();- if (!possibleValues.isEmpty()) {- List<String> copyOfStrings = new ArrayList<>(strings);- copyOfStrings.removeAll(possibleValues);- if (!copyOfStrings.isEmpty())- throw new ValidationException("Invalid choice values: " + copyOfStrings);- else- return strings;- } else {- return strings;- }- } else if (strings.size() == 0) {- return null;- } else if (strings.size() == 1) {- String value = strings.iterator().next();- List<String> possibleValues = getPossibleValues();- if (!possibleValues.isEmpty()) {- if (!possibleValues.contains(value))- throw new ValidationException("Invalid choice value");- else- return value;- } else {- return value;- }- } else {- throw new ValidationException("Not eligible for multi-value");- }- }-- @SuppressWarnings("unchecked")- @Override- public List<String> convertToStrings(Object value) {- List<String> strings = new ArrayList<>();- if (isAllowMultiple()) {- if (checkListElements(value, String.class))- strings.addAll((List<String>) value);- Collections.sort(strings);- } else if (value instanceof String) {- strings.add((String) value);- }- return strings;- }-- @Override- public long getOrdinal(Object fieldValue) {- if (fieldValue != null) {- List<String> choices = new ArrayList<>(getChoiceProvider().getChoices(true).keySet());- return choices.indexOf(fieldValue);- } else {- return super.getOrdinal(fieldValue);- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.javadeleted file mode 100644index 734bc0981c..0000000000--- a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java+++ /dev/null@@ -1,82 +0,0 @@-package io.onedev.server.util.inputspec.dateinput;--import java.util.ArrayList;-import java.util.Date;-import java.util.List;-import java.util.Map;--import javax.validation.ValidationException;--import org.joda.time.DateTime;--import com.google.common.collect.Lists;--import io.onedev.server.util.Constants;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;--@Editable(order=505, name=InputSpec.DATE)-public class DateInput extends InputSpec {-- private static final long serialVersionUID = 1L;-- private DefaultValueProvider defaultValueProvider;-- @Editable(order=1000, name="Default Value")- @NameOfEmptyValue("No default value")- public DefaultValueProvider getDefaultValueProvider() {- return defaultValueProvider;- }-- public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {- this.defaultValueProvider = defaultValueProvider;- }-- @Override- public String getPropertyDef(Map<String, Integer> indexes) {- int index = indexes.get(getName());- StringBuffer buffer = new StringBuffer();- appendField(buffer, index, "Date");- appendCommonAnnotations(buffer, index);- if (!isAllowEmpty())- buffer.append(" @NotNull(message=\"May not be empty\")\n");- appendMethods(buffer, index, "Date", null, defaultValueProvider);-- return buffer.toString();- }-- @Override- public Object convertToObject(List<String> strings) {- if (strings.size() == 1)- return Constants.DATE_FORMATTER.parseDateTime(strings.iterator().next()).toDate();- else if (strings.size() == 0)- return null;- else- throw new ValidationException("Not eligible for multi-value");- }-- @Editable- @Override- public boolean isAllowMultiple() {- return false;- }-- @Override- public List<String> convertToStrings(Object value) {- if (value != null)- return Lists.newArrayList(Constants.DATE_FORMATTER.print(new DateTime(value)));- else- return new ArrayList<>();- }-- @Override- public long getOrdinal(Object fieldValue) {- if (fieldValue instanceof Date)- return ((Date)fieldValue).getTime();- else- return super.getOrdinal(fieldValue);- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.javadeleted file mode 100644index d5f6e13075..0000000000--- a/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java+++ /dev/null@@ -1,114 +0,0 @@-package io.onedev.server.util.inputspec.numberinput;--import java.util.ArrayList;-import java.util.List;-import java.util.Map;--import javax.validation.ValidationException;--import com.google.common.collect.Lists;--import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.numberinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;--@Editable(order=400, name=InputSpec.NUMBER)-public class NumberInput extends InputSpec {-- private static final long serialVersionUID = 1L;-- private Integer minValue;-- private Integer maxValue;-- private DefaultValueProvider defaultValueProvider;-- @Editable(order=1000, description="Optionally specify the minimum value allowed.")- public Integer getMinValue() {- return minValue;- }-- public void setMinValue(Integer minValue) {- this.minValue = minValue;- }-- @Editable(order=1100, description="Optionally specify the maximum value allowed.")- public Integer getMaxValue() {- return maxValue;- }-- public void setMaxValue(Integer maxValue) {- this.maxValue = maxValue;- }-- @Editable(order=1200, name="Default Value")- @NameOfEmptyValue("No default value")- public DefaultValueProvider getDefaultValueProvider() {- return defaultValueProvider;- }-- public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {- this.defaultValueProvider = defaultValueProvider;- }-- @Override- public String getPropertyDef(Map<String, Integer> indexes) {- int index = indexes.get(getName());- StringBuffer buffer = new StringBuffer();- appendField(buffer, index, "Integer");- appendCommonAnnotations(buffer, index);- if (!isAllowEmpty())- buffer.append(" @NotNull(message=\"May not be empty\")\n");- if (minValue != null) {- if (maxValue != null) {- buffer.append(" @Range(min=" + minValue.toString() + "L,max=" + maxValue.toString() +"L)\n");- } else {- buffer.append(" @Range(min=" + minValue.toString() + "L)\n");- }- } else if (maxValue != null) {- buffer.append(" @Range(max=" + maxValue.toString() + "L)\n");- }- appendMethods(buffer, index, "Integer", null, defaultValueProvider);-- return buffer.toString();- }-- @Override- public Object convertToObject(List<String> strings) {- if (strings.size() == 0) {- return null;- } else if (strings.size() == 1) {- try {- return Integer.valueOf(strings.iterator().next());- } catch (NumberFormatException e) {- throw new ValidationException("Invalid number value");- }- } else {- throw new ValidationException("Not eligible for multi-value");- }- }-- @Override- public List<String> convertToStrings(Object value) {- if (value instanceof Integer)- return Lists.newArrayList(String.valueOf(value));- else- return new ArrayList<>();- }-- @Editable- @Override- public boolean isAllowMultiple() {- return false;- }-- @Override- public long getOrdinal(Object fieldValue) {- if (fieldValue != null)- return (Integer)fieldValue;- else- return super.getOrdinal(fieldValue);- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.g4 b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.g4new file mode 100644index 0000000000..e05d2b2f58--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.g4@@ -0,0 +1,11 @@+grammar Interpolative;++interpolative: segment* EOF;++segment: Literal|Variable;++Variable: '@' (ESCAPE|~[@])+? '@';+Literal: (ESCAPE|~[@])+;++fragment+ESCAPE: '\\@';diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.javanew file mode 100644index 0000000000..588f87b14c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java@@ -0,0 +1,98 @@+package io.onedev.server.util.interpolative;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import java.util.function.Function;++import org.antlr.v4.runtime.BailErrorStrategy;+import org.antlr.v4.runtime.BaseErrorListener;+import org.antlr.v4.runtime.CharStream;+import org.antlr.v4.runtime.CharStreams;+import org.antlr.v4.runtime.CommonTokenStream;+import org.antlr.v4.runtime.RecognitionException;+import org.antlr.v4.runtime.Recognizer;+import org.apache.commons.lang3.StringUtils;++import io.onedev.server.OneException;+import io.onedev.server.util.interpolative.InterpolativeParser.InterpolativeContext;+import io.onedev.server.util.interpolative.InterpolativeParser.SegmentContext;+import io.onedev.server.util.interpolative.Segment.Type;++public class Interpolative implements Serializable {++ private static final long serialVersionUID = 1L;++ public static final char MARK = '@';++ private final List<Segment> segments;++ public Interpolative(List<Segment> segments) {+ this.segments = segments;+ }++ public static Interpolative fromString(String interpolativeString) {+ List<Segment> segments = new ArrayList<>();+ for (SegmentContext segment: parse(interpolativeString).segment()) {+ if (segment.Literal() != null)+ segments.add(new Segment(Type.LITERAL, unescape(segment.Literal().getText())));+ else+ segments.add(new Segment(Type.VARIABLE, unescape(segment.Variable().getText())));+ }+ return new Interpolative(segments);+ }++ public List<Segment> getSegments() {+ return segments;+ }++ public String interpolateWith(Function<String, String> interpolator) {+ StringBuilder builder = new StringBuilder();+ for (Segment segment: segments) {+ if (segment.getType() == Type.LITERAL)+ builder.append(segment.getContent());+ else+ builder.append(interpolator.apply(segment.getContent()));+ }+ return builder.toString();+ }++ public static String unescape(String literal) {+ String markString = String.valueOf(MARK);+ if (literal.startsWith(markString))+ literal = literal.substring(1, literal.length()-1);+ return StringUtils.replace(literal, "\\" + markString, markString);+ }++ public static InterpolativeContext parse(String interpolativeString) {+ CharStream is = CharStreams.fromString(interpolativeString);+ InterpolativeLexer lexer = new InterpolativeLexer(is);+ lexer.removeErrorListeners();+ lexer.addErrorListener(new BaseErrorListener() {++ @Override+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,+ int charPositionInLine, String msg, RecognitionException e) {+ throw new OneException("Malformed interpolative");+ }++ });+ CommonTokenStream tokens = new CommonTokenStream(lexer);+ InterpolativeParser parser = new InterpolativeParser(tokens);+ parser.removeErrorListeners();+ parser.setErrorHandler(new BailErrorStrategy());+ return parser.interpolative();+ }++ public static String escape(String literal) {+ StringBuilder builder = new StringBuilder();+ for (int i=0; i<literal.length(); i++) {+ char ch = literal.charAt(i);+ if (ch == MARK)+ builder.append("\\");+ builder.append(ch);+ }+ return builder.toString();+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/Segment.java b/server-core/src/main/java/io/onedev/server/util/interpolative/Segment.javanew file mode 100644index 0000000000..8c15140f11--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/Segment.java@@ -0,0 +1,28 @@+package io.onedev.server.util.interpolative;++import java.io.Serializable;++public class Segment implements Serializable {++ private static final long serialVersionUID = 1L;++ public enum Type {LITERAL, VARIABLE};++ private final Type type;++ private final String content;++ public Segment(Type type, String content) {+ this.type = type;+ this.content = content;+ }++ public Type getType() {+ return type;+ }++ public String getContent() {+ return content;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/patternset/InterpolativePatternSet.g4 b/server-core/src/main/java/io/onedev/server/util/patternset/InterpolativePatternSet.g4new file mode 100644index 0000000000..c7ae1cf356--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/patternset/InterpolativePatternSet.g4@@ -0,0 +1,17 @@+grammar InterpolativePatternSet;++interpolative: segment* EOF;+segment: literal|Variable;+literal: WS* pattern (WS+ pattern)* WS*;+pattern: Excluded? (Quoted|NQuoted);++Variable: '@' (AT_ESCAPE|~[@])+? '@';+Quoted: '"' (QUOTE_ESCAPE|AT_ESCAPE|~["@])+? '"';+NQuoted: (~[-"@ ]|QUOTE_ESCAPE|AT_ESCAPE)(~["@ ]|QUOTE_ESCAPE|AT_ESCAPE)*;+Excluded: '-';++WS: ' ';++fragment+QUOTE_ESCAPE: '\\"';+AT_ESCAPE: '\\@';diff --git a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4 b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4index 2605d052ae..de0aae9f32 100644--- a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4+++ b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4@@ -4,11 +4,11 @@ patterns: WS* pattern (WS+ pattern)* WS* EOF;pattern: Excluded? (Quoted|NQuoted);-Quoted: '"' (ESCAPE|~["\\])+? '"';-NQuoted: ~[-" ]~[" ]*;+Quoted: '"' (ESCAPE|~["])+? '"';+NQuoted: (~[-" ]|ESCAPE)(~[" ]|ESCAPE)*;Excluded: '-';WS: ' ';fragment-ESCAPE: '\\'["\\];+ESCAPE: '\\"';diff --git a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.javaindex 68aa89cf4a..3450db4e24 100644--- a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java+++ b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java@@ -18,7 +18,6 @@ import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;import org.apache.commons.lang3.StringUtils;import org.apache.tools.ant.DirectoryScanner;-import org.unbescape.java.JavaEscape;import io.onedev.commons.utils.match.Matcher;import io.onedev.server.OneException;@@ -29,8 +28,6 @@ public class PatternSet implements Serializable {private static final long serialVersionUID = 1L;- public static final String ESCAPE_CHARS = "\\\"";-private final Set<String> includes;private final Set<String> excludes;@@ -90,20 +87,21 @@ public class PatternSet implements Serializable {if (pattern.Quoted() != null)value = unescape(pattern.Quoted().getText());else- value = pattern.NQuoted().getText();- if (pattern.Excluded() != null) {+ value = unescape(pattern.NQuoted().getText());+ if (pattern.Excluded() != null)excludes.add(value);- } else {+ elseincludes.add(value);- }}}return new PatternSet(includes, excludes);}- public static String unescape(String quoted) {- return JavaEscape.unescapeJava(quoted.substring(1, quoted.length()-1));+ public static String unescape(String pattern) {+ if (pattern.startsWith("\""))+ pattern = pattern.substring(1, pattern.length()-1);+ return StringUtils.replace(pattern, "\\\"", "\"");}public static PatternsContext parse(String patternSetString) {@@ -137,7 +135,7 @@ public class PatternSet implements Serializable {StringBuilder builder = new StringBuilder();for (int i=0; i<pattern.length(); i++) {char ch = pattern.charAt(i);- if (ESCAPE_CHARS.indexOf(ch) != -1)+ if (ch == '"')builder.append("\\");builder.append(ch);}diff --git a/server-core/src/main/java/io/onedev/server/util/scriptidentity/JobIdentity.java b/server-core/src/main/java/io/onedev/server/util/scriptidentity/JobIdentity.javanew file mode 100644index 0000000000..fcb8f2e2e2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/scriptidentity/JobIdentity.java@@ -0,0 +1,26 @@+package io.onedev.server.util.scriptidentity;++import org.eclipse.jgit.lib.ObjectId;++import io.onedev.server.model.Project;++public class JobIdentity implements ScriptIdentity {++ private final Project project;++ private final ObjectId commitId;++ public JobIdentity(Project project, ObjectId commitId) {+ this.project = project;+ this.commitId = commitId;+ }++ public Project getProject() {+ return project;+ }++ public ObjectId getCommitId() {+ return commitId;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/scriptidentity/ScriptIdentity.java b/server-core/src/main/java/io/onedev/server/util/scriptidentity/ScriptIdentity.javanew file mode 100644index 0000000000..41a1dfd65e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/scriptidentity/ScriptIdentity.java@@ -0,0 +1,44 @@+package io.onedev.server.util.scriptidentity;++import java.util.Stack;++import javax.annotation.Nullable;++import io.onedev.server.util.ComponentContext;+import io.onedev.server.web.util.WicketUtils;++public interface ScriptIdentity {++ static ThreadLocal<Stack<ScriptIdentity>> stack = new ThreadLocal<Stack<ScriptIdentity>>() {++ @Override+ protected Stack<ScriptIdentity> initialValue() {+ return new Stack<ScriptIdentity>();+ }++ };++ public static void push(ScriptIdentity scriptIdentity) {+ stack.get().push(scriptIdentity);+ }++ public static void pop() {+ stack.get().pop();+ }++ @Nullable+ public static ScriptIdentity get() {+ if (!stack.get().isEmpty()) {+ return stack.get().peek();+ } else {+ ComponentContext componentContext = ComponentContext.get();+ if (componentContext != null) {+ ScriptIdentityAware scriptIdentityAware = WicketUtils.findInnermost(componentContext.getComponent(), ScriptIdentityAware.class);+ if (scriptIdentityAware != null)+ return scriptIdentityAware.getScriptIdentity();+ }+ return null;+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/scriptidentity/ScriptIdentityAware.java b/server-core/src/main/java/io/onedev/server/util/scriptidentity/ScriptIdentityAware.javanew file mode 100644index 0000000000..586024ceae--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/scriptidentity/ScriptIdentityAware.java@@ -0,0 +1,10 @@+package io.onedev.server.util.scriptidentity;++import javax.annotation.Nullable;++public interface ScriptIdentityAware {++ @Nullable+ ScriptIdentity getScriptIdentity();++}diff --git a/server-core/src/main/java/io/onedev/server/util/scriptidentity/SiteAdministrator.java b/server-core/src/main/java/io/onedev/server/util/scriptidentity/SiteAdministrator.javanew file mode 100644index 0000000000..7b82b60ae1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/scriptidentity/SiteAdministrator.java@@ -0,0 +1,5 @@+package io.onedev.server.util.scriptidentity;++public class SiteAdministrator implements ScriptIdentity {++}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/BranchPatternsValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/BranchPatternsValidator.javadeleted file mode 100644index 647de0b6f2..0000000000--- a/server-core/src/main/java/io/onedev/server/util/validation/BranchPatternsValidator.java+++ /dev/null@@ -1,35 +0,0 @@-package io.onedev.server.util.validation;--import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;--import org.apache.commons.lang3.StringUtils;--import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.web.editable.annotation.BranchPatterns;--public class BranchPatternsValidator implements ConstraintValidator<BranchPatterns, String> {-- @Override- public void initialize(BranchPatterns constaintAnnotation) {- }-- @Override- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {- return true;- } else {- try {- PatternSet.fromString(value);- return true;- } catch (Exception e) {- constraintContext.disableDefaultConstraintViolation();- if (StringUtils.isNotBlank(e.getMessage()))- constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();- else- constraintContext.buildConstraintViolationWithTemplate("Malformed branch patterns").addConstraintViolation();- return false;- }- }- }-}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.javaindex c53165ce0d..cb87f6c691 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java@@ -6,16 +6,18 @@ import javax.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneException;import io.onedev.server.model.Project;-import io.onedev.server.util.OneContext;import io.onedev.server.web.editable.annotation.BuildQuery;public class BuildQueryValidator implements ConstraintValidator<BuildQuery, String> {private boolean noLoginSupport;+ private String message;+@Overridepublic void initialize(BuildQuery constaintAnnotation) {noLoginSupport = constaintAnnotation.noLoginSupport();+ message = constaintAnnotation.message();}@Override@@ -23,20 +25,26 @@ public class BuildQueryValidator implements ConstraintValidator<BuildQuery, Striif (value == null) {return true;} else {- Project project = OneContext.get().getProject();+ Project project = Project.get();try {io.onedev.server.search.entity.build.BuildQuery buildQuery =io.onedev.server.search.entity.build.BuildQuery.parse(project, value, true);- if (noLoginSupport && buildQuery.needsLogin())- throw new OneException("This query needs login which is not supported here");+ if (noLoginSupport && buildQuery.needsLogin()) {+ String message = this.message;+ if (message.length() == 0)+ message = "This query needs login which is not supported here";+ throw new OneException(message);+ }return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();- String message;- if (StringUtils.isNotBlank(e.getMessage()))- message = e.getMessage();- else- message = "Malformed build query";+ String message = this.message;+ if (message.length() == 0) {+ if (StringUtils.isNotBlank(e.getMessage()))+ message = e.getMessage();+ else+ message = "Malformed build query";+ }constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.javaindex 1e59e9495a..95c09e4917 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java@@ -5,13 +5,15 @@ import javax.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Project;-import io.onedev.server.util.OneContext;import io.onedev.server.web.editable.annotation.CodeCommentQuery;public class CodeCommentQueryValidator implements ConstraintValidator<CodeCommentQuery, String> {+ private String message;+@Overridepublic void initialize(CodeCommentQuery constaintAnnotation) {+ message = constaintAnnotation.message();}@Override@@ -19,17 +21,19 @@ public class CodeCommentQueryValidator implements ConstraintValidator<CodeCommenif (value == null) {return true;} else {- Project project = OneContext.get().getProject();+ Project project = Project.get();try {io.onedev.server.search.entity.codecomment.CodeCommentQuery.parse(project, value, true);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();- String message;- if (StringUtils.isNotBlank(e.getMessage()))- message = e.getMessage();- else- message = "Malformed code comment query";+ String message = this.message;+ if (message.length() == 0) {+ if (StringUtils.isNotBlank(e.getMessage()))+ message = e.getMessage();+ else+ message = "Malformed code comment query";+ }constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.javaindex 115f0db8f3..40acc7560b 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java@@ -5,21 +5,30 @@ import javax.validation.ConstraintValidatorContext;import org.eclipse.jgit.lib.ObjectId;+import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.CommitHash;public class CommitHashValidator implements ConstraintValidator<CommitHash, String> {+ private boolean interpolative;++ private String message;+@Overridepublic void initialize(CommitHash constaintAnnotation) {+ interpolative = constaintAnnotation.interpolative();+ message = constaintAnnotation.message();}@Overridepublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {+ if (value == null)+ return true;+ if (interpolative && !Interpolated.get() && !Interpolative.fromString(value).getSegments().isEmpty())return true;- } else if (!ObjectId.isId(value)) {++ if (!ObjectId.isId(value)) {constraintContext.disableDefaultConstraintViolation();- String message = "'" + value + "' is not a valid commit hash";constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;} else {diff --git a/server-core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.javaindex da57fe0103..7100f50372 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java@@ -4,13 +4,16 @@ import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.util.OneContext;+import io.onedev.server.model.Project;import io.onedev.server.web.editable.annotation.CommitQuery;public class CommitQueryValidator implements ConstraintValidator<CommitQuery, String> {+ private String message;+@Overridepublic void initialize(CommitQuery constaintAnnotation) {+ message = constaintAnnotation.message();}@Override@@ -19,15 +22,17 @@ public class CommitQueryValidator implements ConstraintValidator<CommitQuery, Streturn true;} else {try {- io.onedev.server.search.commit.CommitQuery.parse(OneContext.get().getProject(), value);+ io.onedev.server.search.commit.CommitQuery.parse(Project.get(), value);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();- String message;- if (StringUtils.isNotBlank(e.getMessage()))- message = e.getMessage();- else- message = "Malformed commit query";+ String message = this.message;+ if (message.length() == 0) {+ if (StringUtils.isNotBlank(e.getMessage()))+ message = e.getMessage();+ else+ message = "Malformed commit query";+ }constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.javaindex 543866793d..9435024114 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java@@ -11,8 +11,11 @@ import io.onedev.server.util.validation.annotation.CurrentPassword;public class CurrentPasswordValidator implements ConstraintValidator<CurrentPassword, String> {+ private String message;+@Overridepublic void initialize(CurrentPassword constaintAnnotation) {+ message = constaintAnnotation.message();}@Override@@ -25,7 +28,7 @@ public class CurrentPasswordValidator implements ConstraintValidator<CurrentPass} catch (Exception e) {}constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate("Current password does not match").addConstraintViolation();+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;} else {return true;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/DefaultEntityValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/DefaultEntityValidator.javaindex 9401eb8b01..de5378e8d2 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/DefaultEntityValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/DefaultEntityValidator.java@@ -18,7 +18,7 @@ public class DefaultEntityValidator implements EntityValidator {}protected void reportError(AbstractEntity entity, ConstraintViolation<?> violation) {- String errorInfo = String.format("Error validating entity {entity class: %s, entity id: %d, entity property: %s, error message: %s}",+ String errorInfo = String.format("Error validating entity (entity class: %s, entity id: %d, entity property: %s, error message: %s)",entity.getClass(), entity.getId(), violation.getPropertyPath().toString(), violation.getMessage());throw new RuntimeException(errorInfo);}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.javaindex 989acba8a7..bcf95bb0dc 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java@@ -1,12 +1,14 @@package io.onedev.server.util.validation;import java.io.File;+import java.util.function.Function;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;+import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.Directory;public class DirectoryValidator implements ConstraintValidator<Directory, String> {@@ -20,36 +22,61 @@ public class DirectoryValidator implements ConstraintValidator<Directory, String@Overridepublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {- try {- if (value == null)- return true;+ if (value == null)+ return true;+ if (annotation.interpolative() && !Interpolated.get()) try {+ value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {++ @Override+ public String apply(String t) {+ return "a";+ }++ });+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }++ try {File dir = new File(value);if (annotation.absolute()) {if (!dir.isAbsolute()) {constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate("Please specify an absolute directory").addConstraintViolation();+ String message = annotation.message();+ if (message.length() == 0)+ message = "Please specify an absolute directory";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;}}if (annotation.writeable()) {if (!FileUtils.isWritable(dir)) {constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate("Directory is not writeable").addConstraintViolation();+ String message = annotation.message();+ if (message.length() == 0)+ message = "Directory is not writeable";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;}}if (annotation.outsideOfInstallDir()) {if (dir.getCanonicalFile().toPath().startsWith(Bootstrap.installDir.toPath())) {constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate("Please specify a directory outside of the installation directory").addConstraintViolation();+ String message = annotation.message();+ if (message.length() == 0)+ message = "Please specify a directory outside of the installation directory";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;}}return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate("Invalid directory").addConstraintViolation();+ String message = annotation.message();+ if (message.length() == 0)+ message = "Invalid directory";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;}}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.javaindex da1a07fd76..9198c2345d 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java@@ -1,27 +1,48 @@package io.onedev.server.util.validation;+import java.util.function.Function;import java.util.regex.Pattern;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.DnsName;public class DnsNameValidator implements ConstraintValidator<DnsName, String> {private static final Pattern PATTERN = Pattern.compile("[a-z0-9]([-a-z0-9]*[a-z0-9])?");+ private boolean interpolative;++ private String message;+@Overridepublic void initialize(DnsName constaintAnnotation) {+ message = constaintAnnotation.message();}@Overridepublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value != null && !PATTERN.matcher(value).matches()) {- String errorMessage = "can only contain alphanumberic characters or '-', and can only "- + "start and end with alphanumeric characters";+ if (value == null)+ return true;++ if (interpolative && !Interpolated.get()) try {+ value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {++ @Override+ public String apply(String t) {+ return "a";+ }++ });+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }++ if (!PATTERN.matcher(value).matches()) {constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate(errorMessage).addConstraintViolation();+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;} else {return true;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/FieldNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/FieldNameValidator.javanew file mode 100644index 0000000000..f20b53d674--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/validation/FieldNameValidator.java@@ -0,0 +1,35 @@+package io.onedev.server.util.validation;++import javax.validation.ConstraintValidator;+import javax.validation.ConstraintValidatorContext;++import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.validation.annotation.FieldName;++public class FieldNameValidator implements ConstraintValidator<FieldName, String> {++ private String message;++ @Override+ public void initialize(FieldName constaintAnnotation) {+ message = constaintAnnotation.message();+ }++ @Override+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {+ if (value == null)+ return true;++ if (IssueConstants.ALL_FIELDS.contains(value)) {+ constraintContext.disableDefaultConstraintViolation();+ String message = this.message;+ if (message.length() == 0)+ message = "'" + value + "' is reserved";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else {+ return true;+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.javaindex ca5f6cff47..430782d2d3 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java@@ -1,23 +1,48 @@package io.onedev.server.util.validation;+import java.util.function.Function;+import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.GroupName;public class GroupNameValidator implements ConstraintValidator<GroupName, String> {+ private boolean interpolative;++ private String message;+@Overridepublic void initialize(GroupName constaintAnnotation) {+ interpolative = constaintAnnotation.interpolative();+ message = constaintAnnotation.message();}@Overridepublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {+ if (value == null)return true;- } else if (value.equals("new")) {++ if (interpolative && !Interpolated.get()) try {+ value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {++ @Override+ public String apply(String t) {+ return "a";+ }++ });+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }++ if (value.equals("new")) {constraintContext.disableDefaultConstraintViolation();- String message = "'" + value + "' is a reserved name";+ String message = this.message;+ if (message.length() == 0)+ message = "'" + value + "' is a reserved name";constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;} else {diff --git a/server-core/src/main/java/io/onedev/server/util/validation/InputNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/InputNameValidator.javadeleted file mode 100644index ee37aad40a..0000000000--- a/server-core/src/main/java/io/onedev/server/util/validation/InputNameValidator.java+++ /dev/null@@ -1,32 +0,0 @@-package io.onedev.server.util.validation;--import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;-import javax.validation.ValidationException;--import io.onedev.server.util.OneContext;-import io.onedev.server.util.validation.annotation.InputName;--public class InputNameValidator implements ConstraintValidator<InputName, String> {-- @Override- public void initialize(InputName constaintAnnotation) {- }-- @Override- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {- return true;- } else {- try {- OneContext.get().getInputContext().validateName(value);- return true;- } catch (ValidationException e) {- constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();- return false;- }- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/Interpolated.java b/server-core/src/main/java/io/onedev/server/util/validation/Interpolated.javanew file mode 100644index 0000000000..973b197c32--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/validation/Interpolated.java@@ -0,0 +1,31 @@+package io.onedev.server.util.validation;++import java.util.Stack;++public class Interpolated {++ private static ThreadLocal<Stack<Boolean>> stack = new ThreadLocal<Stack<Boolean>>() {++ @Override+ protected Stack<Boolean> initialValue() {+ return new Stack<Boolean>();+ }++ };++ public static void push(boolean interpolated) {+ stack.get().push(interpolated);+ }++ public static void pop() {+ stack.get().pop();+ }++ public static boolean get() {+ if (!stack.get().isEmpty())+ return stack.get().peek();+ else+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.javanew file mode 100644index 0000000000..90b8231578--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.java@@ -0,0 +1,49 @@+package io.onedev.server.util.validation;++import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import javax.validation.ConstraintValidator;+import javax.validation.ConstraintValidatorContext;++import io.onedev.server.web.editable.annotation.Interpolative;++public class InterpolativeValidator implements ConstraintValidator<Interpolative, Object> {++ private String message;++ @Override+ public void initialize(Interpolative constaintAnnotation) {+ message = constaintAnnotation.message();+ }++ @SuppressWarnings("unchecked")+ @Override+ public boolean isValid(Object value, ConstraintValidatorContext constraintContext) {+ if (value == null)+ return true;++ if (!Interpolated.get()) {+ List<String> values = new ArrayList<>();+ if (value instanceof Collection)+ values.addAll((Collection<String>)value);+ else+ values.add((String) value);++ for (String each: values) {+ try {+ io.onedev.server.util.interpolative.Interpolative.fromString(each);+ } catch (Exception e) {+ constraintContext.disableDefaultConstraintViolation();+ String message = this.message;+ if (message.length() == 0)+ message = "Malformed interpolative";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ }+ }+ }+ return true;+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.javaindex dd7560e623..2a420b0f85 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java@@ -5,13 +5,15 @@ import javax.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Project;-import io.onedev.server.util.OneContext;import io.onedev.server.web.editable.annotation.IssueQuery;public class IssueQueryValidator implements ConstraintValidator<IssueQuery, String> {+ private String message;+@Overridepublic void initialize(IssueQuery constaintAnnotation) {+ message = constaintAnnotation.message();}@Override@@ -19,17 +21,19 @@ public class IssueQueryValidator implements ConstraintValidator<IssueQuery, Striif (value == null) {return true;} else {- Project project = OneContext.get().getProject();+ Project project = Project.get();try {io.onedev.server.search.entity.issue.IssueQuery.parse(project, value, true);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();- String message;- if (StringUtils.isNotBlank(e.getMessage()))- message = e.getMessage();- else- message = "Malformed issue query";+ String message = this.message;+ if (message.length() == 0) {+ if (StringUtils.isNotBlank(e.getMessage()))+ message = e.getMessage();+ else+ message = "Malformed issue query";+ }constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/PatternValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/JavaPatternValidator.javasimilarity index 69%rename from server-core/src/main/java/io/onedev/server/util/validation/PatternValidator.javarename to server-core/src/main/java/io/onedev/server/util/validation/JavaPatternValidator.javaindex 8d6e15b0c9..646c6b0c44 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/PatternValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/JavaPatternValidator.java@@ -5,12 +5,15 @@ import java.util.regex.PatternSyntaxException;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import io.onedev.server.util.validation.annotation.Pattern;+import io.onedev.server.util.validation.annotation.JavaPattern;-public class PatternValidator implements ConstraintValidator<Pattern, String> {+public class JavaPatternValidator implements ConstraintValidator<JavaPattern, String> {+ private String message;+@Override- public void initialize(Pattern constaintAnnotation) {+ public void initialize(JavaPattern constaintAnnotation) {+ message = constaintAnnotation.message();}@Override@@ -23,7 +26,6 @@ public class PatternValidator implements ConstraintValidator<Pattern, String> {return true;} catch (PatternSyntaxException e) {constraintContext.disableDefaultConstraintViolation();- String message = "Not a valid Java pattern";constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/NumericValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/NumericValidator.javanew file mode 100644index 0000000000..fcb6d29161--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/validation/NumericValidator.java@@ -0,0 +1,50 @@+package io.onedev.server.util.validation;++import java.util.function.Function;++import javax.validation.ConstraintValidator;+import javax.validation.ConstraintValidatorContext;++import io.onedev.server.util.interpolative.Interpolative;+import io.onedev.server.web.editable.annotation.Numeric;++public class NumericValidator implements ConstraintValidator<Numeric, String> {++ private boolean interpolative;++ private String message;++ @Override+ public void initialize(Numeric constaintAnnotation) {+ message = constaintAnnotation.message();+ }++ @Override+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {+ if (value == null)+ return true;++ if (interpolative && !Interpolated.get()) try {+ value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {++ @Override+ public String apply(String t) {+ return "1";+ }++ });+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }++ try {+ Long.parseLong(value);+ } catch (NumberFormatException e) {+ constraintContext.disableDefaultConstraintViolation();+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ }+ return true;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.javanew file mode 100644index 0000000000..af4d5edc2c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java@@ -0,0 +1,44 @@+package io.onedev.server.util.validation;++import javax.lang.model.SourceVersion;+import javax.validation.ConstraintValidator;+import javax.validation.ConstraintValidatorContext;++import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.validation.annotation.ParamName;++public class ParamNameValidator implements ConstraintValidator<ParamName, String> {++ private String message;++ @Override+ public void initialize(ParamName constaintAnnotation) {+ message = constaintAnnotation.message();+ }++ @Override+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {+ if (value == null)+ return true;++ String message = this.message;+ if (!SourceVersion.isIdentifier(value) || value.contains("$")) {+ constraintContext.disableDefaultConstraintViolation();+ if (message.length() == 0) {+ message = "param name should start with letter and can only consist of "+ + "alphanumeric and underscore characters";+ }+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else if (BuildConstants.ALL_FIELDS.contains(value)) {+ constraintContext.disableDefaultConstraintViolation();+ if (message.length() == 0)+ message = "'" + value + "' is reserved";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else {+ return true;+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/PathSegmentValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/PathSegmentValidator.javaindex 330d9a3e85..fc03ababa3 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/PathSegmentValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/PathSegmentValidator.java@@ -1,16 +1,24 @@package io.onedev.server.util.validation;import java.nio.file.Paths;+import java.util.function.Function;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.PathSegment;public class PathSegmentValidator implements ConstraintValidator<PathSegment, String> {+ private boolean interpolative;++ private String message;+@Overridepublic void initialize(PathSegment constaintAnnotation) {+ interpolative = constaintAnnotation.interpolative();+ message = constaintAnnotation.message();}@Override@@ -18,20 +26,38 @@ public class PathSegmentValidator implements ConstraintValidator<PathSegment, Stif (value == null)return true;- String errorMessage = null;+ if (interpolative && !Interpolated.get()) try {+ value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {++ @Override+ public String apply(String t) {+ return "a";+ }++ });+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }++ boolean valid = true;+ String message = this.message;if (value.contains("/") || value.contains("\\")) {- errorMessage = "Slash and back slash characters are not allowed";+ valid = false;+ if (message.length() == 0)+ message = "Slash and back slash characters are not allowed";} else {try {Paths.get(value);} catch (Exception e) {- errorMessage = e.getMessage();+ valid = false;+ if (message.length() == 0)+ message = e.getMessage();}}- if (errorMessage != null) {+ if (!valid) {constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate(errorMessage).addConstraintViolation();+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/PathValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/PathValidator.javaindex c061997111..31fdddb4b5 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/PathValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/PathValidator.java@@ -1,29 +1,49 @@package io.onedev.server.util.validation;import java.nio.file.Paths;+import java.util.function.Function;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.Path;public class PathValidator implements ConstraintValidator<Path, String> {+ private boolean interpolative;++ private String message;+@Overridepublic void initialize(Path constaintAnnotation) {+ interpolative = constaintAnnotation.interpolative();+ message = constaintAnnotation.message();}@Overridepublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {if (value == null)return true;++ if (interpolative && !Interpolated.get()) try {+ value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {+ @Override+ public String apply(String t) {+ return "a";+ }++ });+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }try {Paths.get(value);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;}}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/PatternsValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/PatternsValidator.javaindex 47aa22e86e..5571b36440 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/PatternsValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/PatternsValidator.java@@ -1,35 +1,49 @@package io.onedev.server.util.validation;+import java.util.function.Function;+import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import org.apache.commons.lang3.StringUtils;-+import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Patterns;public class PatternsValidator implements ConstraintValidator<Patterns, String> {+ private boolean interpolative;++ private String message;+@Overridepublic void initialize(Patterns constaintAnnotation) {+ interpolative = constaintAnnotation.interpolative();+ message = constaintAnnotation.message();}@Overridepublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {+ if (value == null)+ return true;+ if (interpolative && !Interpolated.get()) try {+ value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {++ @Override+ public String apply(String t) {+ return "a";+ }++ });+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }+ try {+ PatternSet.fromString(value);return true;- } else {- try {- PatternSet.fromString(value);- return true;- } catch (Exception e) {- constraintContext.disableDefaultConstraintViolation();- if (StringUtils.isNotBlank(e.getMessage()))- constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();- else- constraintContext.buildConstraintViolationWithTemplate("Malformed patterns").addConstraintViolation();- return false;- }+ } catch (Exception e) {+ constraintContext.disableDefaultConstraintViolation();+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;}}}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.javaindex 82a4c5ce5b..644aba3a85 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java@@ -1,32 +1,58 @@package io.onedev.server.util.validation;+import java.util.function.Function;import java.util.regex.Pattern;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.ProjectName;public class ProjectNameValidator implements ConstraintValidator<ProjectName, String> {private static final Pattern PATTERN = Pattern.compile("[\\w-\\.]+");+ private boolean interpolative;++ private String message;+@Overridepublic void initialize(ProjectName constaintAnnotation) {+ message = constaintAnnotation.message();+ interpolative = constaintAnnotation.interpolative();}@Overridepublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {+ if (value == null)return true;- } else if (!PATTERN.matcher(value).matches()) {++ if (interpolative && !Interpolated.get()) try {+ value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {++ @Override+ public String apply(String t) {+ return "a";+ }++ });+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }++ if (!PATTERN.matcher(value).matches()) {constraintContext.disableDefaultConstraintViolation();- String message = "Only alphanumeric, underscore, dash, and dot are accepted";+ String message = this.message;+ if (message.length() == 0)+ message = "Only alphanumeric, underscore, dash, and dot are accepted";constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;} else if (value.equals("new")) {constraintContext.disableDefaultConstraintViolation();- String message = "'new' is reserved and can not be used as project name";+ String message = this.message;+ if (message.length() == 0)+ message = "'" + value + "' is a reserved name";constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;} else {diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ProjectPatternsValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ProjectPatternsValidator.javadeleted file mode 100644index 10acb3f287..0000000000--- a/server-core/src/main/java/io/onedev/server/util/validation/ProjectPatternsValidator.java+++ /dev/null@@ -1,35 +0,0 @@-package io.onedev.server.util.validation;--import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;--import org.apache.commons.lang3.StringUtils;--import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.web.editable.annotation.ProjectPatterns;--public class ProjectPatternsValidator implements ConstraintValidator<ProjectPatterns, String> {-- @Override- public void initialize(ProjectPatterns constaintAnnotation) {- }-- @Override- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {- return true;- } else {- try {- PatternSet.fromString(value);- return true;- } catch (Exception e) {- constraintContext.disableDefaultConstraintViolation();- if (StringUtils.isNotBlank(e.getMessage()))- constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();- else- constraintContext.buildConstraintViolationWithTemplate("Malformed project patterns").addConstraintViolation();- return false;- }- }- }-}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.javaindex 6fece1b8a1..d60ebcbee6 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java@@ -5,13 +5,15 @@ import javax.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Project;-import io.onedev.server.util.OneContext;import io.onedev.server.web.editable.annotation.PullRequestQuery;public class PullRequestQueryValidator implements ConstraintValidator<PullRequestQuery, String> {+ private String message;+@Overridepublic void initialize(PullRequestQuery constaintAnnotation) {+ message = constaintAnnotation.message();}@Override@@ -19,17 +21,20 @@ public class PullRequestQueryValidator implements ConstraintValidator<PullRequesif (value == null) {return true;} else {- Project project = OneContext.get().getProject();+ Project project = Project.get();try {io.onedev.server.search.entity.pullrequest.PullRequestQuery.parse(project, value, true);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();- String message;- if (StringUtils.isNotBlank(e.getMessage()))- message = e.getMessage();- else- message = "Malformed pull request query";++ String message = this.message;+ if (message.length() == 0) {+ if (StringUtils.isNotBlank(e.getMessage()))+ message = e.getMessage();+ else+ message = "Malformed pull request query";+ }constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.javanew file mode 100644index 0000000000..32b699bebf--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.java@@ -0,0 +1,53 @@+package io.onedev.server.util.validation;++import java.util.function.Function;+import java.util.regex.Pattern;++import javax.validation.ConstraintValidator;+import javax.validation.ConstraintValidatorContext;++import io.onedev.server.util.interpolative.Interpolative;+import io.onedev.server.util.validation.annotation.RegEx;++public class RegExValidator implements ConstraintValidator<RegEx, String> {++ private boolean interpolative;++ private Pattern pattern;++ private String message;++ @Override+ public void initialize(RegEx constaintAnnotation) {+ interpolative = constaintAnnotation.interpolative();+ pattern = Pattern.compile(constaintAnnotation.value());+ message = constaintAnnotation.message();+ }++ @Override+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {+ if (value == null)+ return true;++ if (interpolative && !Interpolated.get()) try {+ value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {++ @Override+ public String apply(String t) {+ return "a";+ }++ });+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }+ if (pattern.matcher(value).matches()) {+ return true;+ } else {+ constraintContext.disableDefaultConstraintViolation();+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.javaindex 0a3f0db043..514a5e2ee6 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java@@ -9,8 +9,11 @@ import io.onedev.server.web.editable.annotation.ReviewRequirement;public class ReviewRequirementValidator implements ConstraintValidator<ReviewRequirement, String> {+ private String message;+@Overridepublic void initialize(ReviewRequirement constaintAnnotation) {+ message = constaintAnnotation.message();}@Override@@ -23,10 +26,14 @@ public class ReviewRequirementValidator implements ConstraintValidator<ReviewReqreturn true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();- if (StringUtils.isNotBlank(e.getMessage()))- constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();- else- constraintContext.buildConstraintViolationWithTemplate("Malformed review requirement").addConstraintViolation();+ String message = this.message;+ if (message.length() == 0) {+ if (StringUtils.isNotBlank(e.getMessage()))+ message = e.getMessage();+ else+ message = "Malformed review requirement";+ }+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;}}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/TagPatternsValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/TagPatternsValidator.javadeleted file mode 100644index dc1cc8499a..0000000000--- a/server-core/src/main/java/io/onedev/server/util/validation/TagPatternsValidator.java+++ /dev/null@@ -1,35 +0,0 @@-package io.onedev.server.util.validation;--import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;--import org.apache.commons.lang3.StringUtils;--import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.web.editable.annotation.TagPatterns;--public class TagPatternsValidator implements ConstraintValidator<TagPatterns, String> {-- @Override- public void initialize(TagPatterns constaintAnnotation) {- }-- @Override- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {- return true;- } else {- try {- PatternSet.fromString(value);- return true;- } catch (Exception e) {- constraintContext.disableDefaultConstraintViolation();- if (StringUtils.isNotBlank(e.getMessage()))- constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();- else- constraintContext.buildConstraintViolationWithTemplate("Malformed tag patterns").addConstraintViolation();- return false;- }- }- }-}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/UserMatcherValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/UserMatcherValidator.javaindex 58ed158948..7f796659fb 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/UserMatcherValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/UserMatcherValidator.java@@ -8,8 +8,11 @@ import io.onedev.server.web.editable.annotation.UserMatcher;public class UserMatcherValidator implements ConstraintValidator<UserMatcher, String> {+ private String message;+@Overridepublic void initialize(UserMatcher constaintAnnotation) {+ message = constaintAnnotation.message();}@Override@@ -22,11 +25,13 @@ public class UserMatcherValidator implements ConstraintValidator<UserMatcher, Streturn true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();- String message;- if (StringUtils.isNotBlank(e.getMessage()))- message = e.getMessage();- else- message = "Malformed user matcher";+ String message = this.message;+ if (message.length() == 0) {+ if (StringUtils.isNotBlank(e.getMessage()))+ message = e.getMessage();+ else+ message = "Malformed user matcher";+ }constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.javaindex 1b2f8ae3d7..92c7bd4c99 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java@@ -1,23 +1,48 @@package io.onedev.server.util.validation;+import java.util.function.Function;+import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.UserName;public class UserNameValidator implements ConstraintValidator<UserName, String> {+ private boolean interpolative;++ private String message;+@Overridepublic void initialize(UserName constaintAnnotation) {+ interpolative = constaintAnnotation.interpolative();+ message = constaintAnnotation.message();}@Overridepublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {+ if (value == null)return true;- } else if (value.equals("new")) {++ if (interpolative && !Interpolated.get()) try {+ value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {++ @Override+ public String apply(String t) {+ return "a";+ }++ });+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }++ if (value.equals("new")) {constraintContext.disableDefaultConstraintViolation();- String message = "'" + value + "' is a reserved name";+ String message = this.message;+ if (message.length() == 0)+ message = "'" + value + "' is a reserved name";constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;} else {diff --git a/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.javaindex 392883aa94..6e92e4f4ce 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java@@ -1,26 +1,47 @@package io.onedev.server.util.validation;+import java.util.function.Function;+import javax.lang.model.SourceVersion;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.VariableName;public class VariableNameValidator implements ConstraintValidator<VariableName, String> {+ private boolean interpolative;++ private String message;+@Overridepublic void initialize(VariableName constaintAnnotation) {+ interpolative = constaintAnnotation.interpolative();+ message = constaintAnnotation.message();}@Overridepublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {+ if (value == null)return true;- } else if (!SourceVersion.isIdentifier(value) || value.contains("$")) {++ if (interpolative && !Interpolated.get()) try {+ value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {++ @Override+ public String apply(String t) {+ return "a";+ }++ });+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }++ if (!SourceVersion.isIdentifier(value) || value.contains("$")) {constraintContext.disableDefaultConstraintViolation();- String errorMessage = "name should start with letter and can only consist of "- + "alphanumeric and underscore characters";- constraintContext.buildConstraintViolationWithTemplate(errorMessage).addConstraintViolation();+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;} else {return true;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/CommitHash.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/CommitHash.javaindex 68b447d9f6..15fe5d7d19 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/CommitHash.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/CommitHash.java@@ -15,7 +15,9 @@ import io.onedev.server.util.validation.CommitHashValidator;@Constraint(validatedBy=CommitHashValidator.class)public @interface CommitHash {- String message() default "";+ boolean interpolative() default false;++ String message() default "Not a valid commit hash";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/CurrentPassword.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/CurrentPassword.javaindex a87b5cb909..3a88e96684 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/CurrentPassword.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/CurrentPassword.java@@ -25,7 +25,7 @@ import io.onedev.server.util.validation.CurrentPasswordValidator;@Constraint(validatedBy=CurrentPasswordValidator.class)public @interface CurrentPassword {- String message() default "Old password does not match";+ String message() default "Current password does not match";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/Directory.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/Directory.javaindex eec1fd0f03..d7b03d3d33 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/Directory.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/Directory.java@@ -18,13 +18,15 @@ import io.onedev.server.util.validation.DirectoryValidator;@Constraint(validatedBy=DirectoryValidator.class)public @interface Directory {+ boolean interpolative() default false;+boolean writeable();boolean outsideOfInstallDir();boolean absolute();-- String message() default "Invalid directory";++ String message() default "";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/DnsName.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/DnsName.javaindex 3424ac8443..782a804f82 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/DnsName.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/DnsName.java@@ -15,7 +15,10 @@ import io.onedev.server.util.validation.DnsNameValidator;@Constraint(validatedBy=DnsNameValidator.class)public @interface DnsName {- String message() default "";+ boolean interpolative() default false;++ String message() default "can only contain alphanumberic characters or '-', and can only "+ + "start and end with alphanumeric characters";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/Pattern.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/FieldName.javasimilarity index 72%rename from server-core/src/main/java/io/onedev/server/util/validation/annotation/Pattern.javarename to server-core/src/main/java/io/onedev/server/util/validation/annotation/FieldName.javaindex 733497e1da..dbb0b4a738 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/Pattern.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/FieldName.java@@ -8,15 +8,15 @@ import java.lang.annotation.Target;import javax.validation.Constraint;import javax.validation.Payload;-import io.onedev.server.util.validation.PatternValidator;+import io.onedev.server.util.validation.FieldNameValidator;@Target({ElementType.METHOD, ElementType.FIELD})@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=PatternValidator.class)-public @interface Pattern {-- String message() default "";+@Constraint(validatedBy=FieldNameValidator.class)+public @interface FieldName {+ String message() default "";+Class<?>[] groups() default {};Class<? extends Payload>[] payload() default {};diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/GroupName.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/GroupName.javaindex 401c2ee607..34ea40a876 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/GroupName.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/GroupName.java@@ -15,8 +15,10 @@ import io.onedev.server.util.validation.GroupNameValidator;@Constraint(validatedBy=GroupNameValidator.class)public @interface GroupName {- String message() default "";-+ boolean interpolative() default false;++ String message() default "";+Class<?>[] groups() default {};Class<? extends Payload>[] payload() default {};diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/JavaPattern.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/JavaPattern.javanew file mode 100644index 0000000000..534f1dd0b9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/JavaPattern.java@@ -0,0 +1,23 @@+package io.onedev.server.util.validation.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++import javax.validation.Constraint;+import javax.validation.Payload;++import io.onedev.server.util.validation.JavaPatternValidator;++@Target({ElementType.METHOD, ElementType.FIELD})+@Retention(RetentionPolicy.RUNTIME)+@Constraint(validatedBy=JavaPatternValidator.class)+public @interface JavaPattern {++ String message() default "Not a valid Java pattern";++ Class<?>[] groups() default {};++ Class<? extends Payload>[] payload() default {};+}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/InputName.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/ParamName.javasimilarity index 72%rename from server-core/src/main/java/io/onedev/server/util/validation/annotation/InputName.javarename to server-core/src/main/java/io/onedev/server/util/validation/annotation/ParamName.javaindex 25c70b951a..5fd428adff 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/InputName.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/ParamName.java@@ -8,15 +8,15 @@ import java.lang.annotation.Target;import javax.validation.Constraint;import javax.validation.Payload;-import io.onedev.server.util.validation.InputNameValidator;+import io.onedev.server.util.validation.ParamNameValidator;@Target({ElementType.METHOD, ElementType.FIELD})@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=InputNameValidator.class)-public @interface InputName {-- String message() default "";+@Constraint(validatedBy=ParamNameValidator.class)+public @interface ParamName {+ String message() default "";+Class<?>[] groups() default {};Class<? extends Payload>[] payload() default {};diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/Path.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/Path.javaindex e2ddf07858..f395d93e99 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/Path.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/Path.java@@ -18,6 +18,8 @@ import io.onedev.server.util.validation.PathValidator;@Constraint(validatedBy=PathValidator.class)public @interface Path {+ boolean interpolative() default false;+String message() default "Invalid path";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/PathSegment.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/PathSegment.javaindex 4d15282ab1..ea7f10b82a 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/PathSegment.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/PathSegment.java@@ -18,7 +18,9 @@ import io.onedev.server.util.validation.PathSegmentValidator;@Constraint(validatedBy=PathSegmentValidator.class)public @interface PathSegment {- String message() default "Invalid path segment";+ boolean interpolative() default false;++ String message() default "";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/ProjectName.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/ProjectName.javaindex 1b7a4dd85f..a6fe51c8c1 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/ProjectName.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/ProjectName.java@@ -15,8 +15,10 @@ import io.onedev.server.util.validation.ProjectNameValidator;@Constraint(validatedBy=ProjectNameValidator.class)public @interface ProjectName {- String message() default "";-+ boolean interpolative() default false;++ String message() default "";+Class<?>[] groups() default {};Class<? extends Payload>[] payload() default {};diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/RegEx.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/RegEx.javanew file mode 100644index 0000000000..6804668788--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/RegEx.java@@ -0,0 +1,27 @@+package io.onedev.server.util.validation.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++import javax.validation.Constraint;+import javax.validation.Payload;++import io.onedev.server.util.validation.RegExValidator;++@Target({ElementType.METHOD, ElementType.FIELD})+@Retention(RetentionPolicy.RUNTIME)+@Constraint(validatedBy=RegExValidator.class)+public @interface RegEx {++ boolean interpolative() default false;++ String value();++ String message() default "Not matching specified regular expression";++ Class<?>[] groups() default {};++ Class<? extends Payload>[] payload() default {};+}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/UserName.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/UserName.javaindex b66cfc552e..399fd9cde3 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/UserName.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/UserName.java@@ -15,8 +15,10 @@ import io.onedev.server.util.validation.UserNameValidator;@Constraint(validatedBy=UserNameValidator.class)public @interface UserName {- String message() default "";-+ boolean interpolative() default false;++ String message() default "";+Class<?>[] groups() default {};Class<? extends Payload>[] payload() default {};diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/VariableName.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/VariableName.javaindex 4a5d56c16b..088425940f 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/VariableName.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/VariableName.java@@ -15,8 +15,11 @@ import io.onedev.server.util.validation.VariableNameValidator;@Constraint(validatedBy=VariableNameValidator.class)public @interface VariableName {- String message() default "";-+ boolean interpolative() default false;++ String message() default "name should start with letter and can only consist of "+ + "alphanumeric and underscore characters";+Class<?>[] groups() default {};Class<? extends Payload>[] payload() default {};diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 0801482985..59e243a9d7 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -20,6 +20,7 @@ import io.onedev.server.web.mapper.OnePageMapper;import io.onedev.server.web.mapper.OneResourceMapper;import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;+import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;import io.onedev.server.web.page.admin.group.GroupAuthorizationsPage;import io.onedev.server.web.page.admin.group.GroupListPage;import io.onedev.server.web.page.admin.group.GroupMembershipsPage;@@ -158,6 +159,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("administration/settings/authenticator", AuthenticatorPage.class));add(new OnePageMapper("administration/settings/job-executors", JobExecutorPage.class));+ add(new OnePageMapper("administration/settings/groovy-scripts", GroovyScriptListPage.class));add(new OnePageMapper("administration/settings/issue-fields", IssueFieldListPage.class));add(new OnePageMapper("administration/settings/issue-states", IssueStateListPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.javaindex 8e1d00dff7..82dbae22b1 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java@@ -44,6 +44,7 @@ public class CodeMirrorResourceReference extends BaseDependentResourceReferencedependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/scroll/annotatescrollbar.js")));dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/display/fullscreen.js")));dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/selection/mark-selection.js")));+ dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/hint/show-hint.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "annotatescrollbar2.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "simplescrollbars.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "gotoline.js")));@@ -61,6 +62,7 @@ public class CodeMirrorResourceReference extends BaseDependentResourceReferencedependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/addon/scroll/simplescrollbars.css")));dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/addon/search/matchesonscrollbar.css")));dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/addon/display/fullscreen.css")));+ dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/addon/hint/show-hint.css")));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(CodeMirrorResourceReference.class, "highlight.css")));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(CodeMirrorResourceReference.class, "codemirror.css")));diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.javanew file mode 100644index 0000000000..eece8e386b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.java@@ -0,0 +1,104 @@+package io.onedev.server.web.behavior;++import java.util.HashSet;+import java.util.List;+import java.util.Set;+import java.util.stream.Collectors;++import org.antlr.v4.runtime.Token;++import com.google.common.base.Optional;+import com.google.common.collect.Lists;++import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;+import io.onedev.commons.codeassist.parser.ParseExpect;+import io.onedev.commons.codeassist.parser.TerminalExpect;+import io.onedev.server.util.interpolative.Interpolative;+import io.onedev.server.util.interpolative.InterpolativeLexer;+import io.onedev.server.util.interpolative.InterpolativeParser;+import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;++@SuppressWarnings("serial")+public abstract class InterpolativeAssistBehavior extends ANTLRAssistBehavior {++ public InterpolativeAssistBehavior() {+ super(InterpolativeParser.class, "interpolative", false);+ }++ @Override+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {+ String mark = String.valueOf(Interpolative.MARK);+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();++ Set<String> matches = new HashSet<>();+ for (Token token: terminalExpect.getRoot().getState().getMatchedTokens()) {+ if (token.getType() == InterpolativeLexer.Variable)+ matches.add(Interpolative.unescape(token.getText()));+ }++ String unmatched = terminalExpect.getUnmatchedText();+ if (spec.getRuleName().equals("Variable") && unmatched.startsWith(mark)) {+ return new FenceAware(codeAssist.getGrammar(), mark, mark) {++ @Override+ protected List<InputSuggestion> match(String unfencedMatchWith) {+ List<InputSuggestion> suggestions = suggestVariables(unfencedMatchWith)+ .stream()+ .filter(it->!matches.contains(it.getContent()))+ .collect(Collectors.toList());+ if (unfencedMatchWith.length() != 0+ && !matches.contains(unfencedMatchWith)+ && suggestions.isEmpty()) {+ return null;+ } else {+ return suggestions.stream().map(it->it.escape(mark)).collect(Collectors.toList());+ }+ }++ @Override+ protected String getFencingDescription() {+ return null;+ }++ }.suggest(terminalExpect);+ } else if (spec.getRuleName().equals("Literal")) {+ List<InputSuggestion> suggestions = suggestLiterals(unmatched)+ .stream()+ .filter(it->!matches.contains(it.getContent()))+ .collect(Collectors.toList());+ if (unmatched.length() != 0+ && !matches.contains(unmatched)+ && suggestions.isEmpty()) {+ return null;+ } else {+ return suggestions.stream().map(it->it.escape(mark)).collect(Collectors.toList());+ }+ }+ }+ return null;+ }++ @Override+ protected List<String> getHints(TerminalExpect terminalExpect) {+ return Lists.newArrayList(+ String.format("Type '%c' to start inserting variable", Interpolative.MARK),+ String.format("Type '\\%c' to input normal '%c' character",+ Interpolative.MARK, Interpolative.MARK));+ }++ @Override+ protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {+ if (suggestedLiteral.equals(String.valueOf(Interpolative.MARK)))+ return null;+ else+ return Optional.fromNullable(null);+ }++ protected abstract List<InputSuggestion> suggestVariables(String matchWith);++ protected abstract List<InputSuggestion> suggestLiterals(String matchWith);++}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.javanew file mode 100644index 0000000000..c821dcb861--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.java@@ -0,0 +1,144 @@+package io.onedev.server.web.behavior;++import java.util.HashSet;+import java.util.List;+import java.util.Set;+import java.util.stream.Collectors;++import org.antlr.v4.runtime.Token;+import org.apache.commons.lang3.StringUtils;++import com.google.common.base.Optional;++import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;+import io.onedev.commons.codeassist.parser.ParseExpect;+import io.onedev.commons.codeassist.parser.TerminalExpect;+import io.onedev.commons.utils.LinearRange;+import io.onedev.server.util.interpolative.Interpolative;+import io.onedev.server.util.patternset.InterpolativePatternSetLexer;+import io.onedev.server.util.patternset.InterpolativePatternSetParser;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;++@SuppressWarnings("serial")+public abstract class InterpolativePatternSetAssistBehavior extends ANTLRAssistBehavior {++ public InterpolativePatternSetAssistBehavior() {+ super(InterpolativePatternSetParser.class, "interpolative", false);+ }++ @Override+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();++ String mark = String.valueOf(Interpolative.MARK);+ Set<String> matches = new HashSet<>();+ for (Token token: terminalExpect.getRoot().getState().getMatchedTokens()) {+ if (token.getType() == InterpolativePatternSetLexer.Variable) {+ matches.add(Interpolative.unescape(token.getText()));+ } else if (token.getType() == InterpolativePatternSetLexer.Quoted+ || token.getType() == InterpolativePatternSetLexer.NQuoted) {+ matches.add(PatternSet.unescape(token.getText()));+ }+ }++ String unmatched = terminalExpect.getUnmatchedText();+ if (spec.getRuleName().equals("Variable") && unmatched.startsWith(mark)) {+ return new FenceAware(codeAssist.getGrammar(), mark, mark) {++ @Override+ protected List<InputSuggestion> match(String unfencedMatchWith) {+ List<InputSuggestion> suggestions = suggestVariables(unfencedMatchWith)+ .stream()+ .filter(it->!matches.contains(it.getContent()))+ .collect(Collectors.toList());+ if (unfencedMatchWith.length() != 0+ && !matches.contains(unfencedMatchWith)+ && suggestions.isEmpty()) {+ return null;+ } else {+ return suggestions.stream().map(it->it.escape(mark)).collect(Collectors.toList());+ }+ }++ @Override+ protected String getFencingDescription() {+ return null;+ }++ }.suggest(terminalExpect);+ } else if (spec.getRuleName().equals("NQuoted")) {+ List<InputSuggestion> suggestions = suggestPatterns(unmatched);+ return suggestions+ .stream()+ .filter(it->!matches.contains(it.getContent()))+ .map(it->{+ if (StringUtils.containsAny(it.getContent(), " \"") || it.getContent().startsWith("-")) {+ InputSuggestion suggestion = it.escape("\"" + mark);+ suggestion = new InputSuggestion("\"" + suggestion.getContent() + "\"",+ suggestion.getCaret()!=-1? suggestion.getCaret()+1: -1,+ suggestion.getDescription(),+ new LinearRange(suggestion.getMatch().getFrom()+1, suggestion.getMatch().getTo()+1));+ return suggestion;+ } else {+ return it;+ }+ })+ .collect(Collectors.toList());+ } else if (spec.getRuleName().equals("Quoted") && unmatched.startsWith("\"")) {+ return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {++ @Override+ protected List<InputSuggestion> match(String unfencedMatchWith) {+ List<InputSuggestion> suggestions = suggestPatterns(unfencedMatchWith)+ .stream()+ .filter(it->!matches.contains(it.getContent()))+ .collect(Collectors.toList());+ if (unfencedMatchWith.length() != 0+ && !matches.contains(unfencedMatchWith)+ && suggestions.isEmpty()) {+ return null;+ } else {+ return suggestions.stream().map(it->it.escape("\"" + mark)).collect(Collectors.toList());+ }+ }++ @Override+ protected String getFencingDescription() {+ return null;+ }++ }.suggest(terminalExpect);+ }+ }+ return null;+ }++ @Override+ protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {+ if (suggestedLiteral.equals(String.valueOf(Interpolative.MARK)))+ return null;+ String description;+ switch (suggestedLiteral) {+ case "-":+ description = "exclude";+ break;+ case " ":+ description = "space";+ break;+ case "\"":+ return null;+ default:+ description = null;+ }+ return Optional.fromNullable(description);+ }++ protected abstract List<InputSuggestion> suggestVariables(String matchWith);++ protected abstract List<InputSuggestion> suggestPatterns(String matchWith);++}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 4a1ac16bd4..a1e4dd41f5 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -41,27 +41,25 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.fieldspec.BooleanField;+import io.onedev.server.model.support.issue.fieldspec.BuildChoiceField;+import io.onedev.server.model.support.issue.fieldspec.ChoiceField;+import io.onedev.server.model.support.issue.fieldspec.DateField;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.fieldspec.GroupChoiceField;+import io.onedev.server.model.support.issue.fieldspec.IssueChoiceField;+import io.onedev.server.model.support.issue.fieldspec.NumberField;+import io.onedev.server.model.support.issue.fieldspec.PullRequestChoiceField;+import io.onedev.server.model.support.issue.fieldspec.TextField;+import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.search.entity.issue.IssueQueryParser;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.EditContext;import io.onedev.server.util.IssueConstants;-import io.onedev.server.util.OneContext;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.inputspec.BuildChoiceInput;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.IssueChoiceInput;-import io.onedev.server.util.inputspec.PullRequestChoiceInput;-import io.onedev.server.util.inputspec.booleaninput.BooleanInput;-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;-import io.onedev.server.util.inputspec.dateinput.DateInput;-import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;-import io.onedev.server.util.inputspec.numberinput.NumberInput;-import io.onedev.server.util.inputspec.textinput.TextInput;-import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -115,13 +113,13 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {if ("criteriaField".equals(spec.getLabel())) {List<String> candidates = new ArrayList<>(IssueConstants.QUERY_FIELDS);- for (InputSpec field: issueSetting.getFieldSpecs())+ for (FieldSpec field: issueSetting.getFieldSpecs())candidates.add(field.getName());suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));} else if ("orderField".equals(spec.getLabel())) {List<String> candidates = new ArrayList<>(IssueConstants.ORDER_FIELDS.keySet());- for (InputSpec field: issueSetting.getFieldSpecs()) {- if (field instanceof NumberInput || field instanceof ChoiceInput || field instanceof DateInput)+ for (FieldSpec field: issueSetting.getFieldSpecs()) {+ if (field instanceof NumberField || field instanceof ChoiceField || field instanceof DateField)candidates.add(field.getName());}suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));@@ -158,46 +156,46 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {try {IssueQuery.checkField(fieldName, operator);- InputSpec fieldSpec = issueSetting.getFieldSpec(fieldName);- if (fieldSpec instanceof DateInput || fieldName.equals(FIELD_SUBMIT_DATE)+ FieldSpec fieldSpec = issueSetting.getFieldSpec(fieldName);+ if (fieldSpec instanceof DateField || fieldName.equals(FIELD_SUBMIT_DATE)|| fieldName.equals(FIELD_UPDATE_DATE)) {suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith));CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));- } else if (fieldSpec instanceof UserChoiceInput) {+ } else if (fieldSpec instanceof UserChoiceField) {suggestions.addAll(escape(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith)));- } else if (fieldSpec instanceof IssueChoiceInput) {+ } else if (fieldSpec instanceof IssueChoiceField) {List<Issue> issues = OneDev.getInstance(IssueManager.class).query(project, unfencedLowerCaseMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);for (Issue issue: issues) {InputSuggestion suggestion = new InputSuggestion("#" + issue.getNumber(), StringUtils.abbreviate(issue.getTitle(), MAX_ISSUE_TITLE_LEN), null);suggestions.add(suggestion);}- } else if (fieldSpec instanceof BuildChoiceInput) {+ } else if (fieldSpec instanceof BuildChoiceField) {List<Build> builds = OneDev.getInstance(BuildManager.class).query(project, unfencedLowerCaseMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);for (Build build: builds) {InputSuggestion suggestion = new InputSuggestion("#" + build.getNumber(), null, null);suggestions.add(suggestion);}- } else if (fieldSpec instanceof PullRequestChoiceInput) {+ } else if (fieldSpec instanceof PullRequestChoiceField) {List<PullRequest> requests = OneDev.getInstance(PullRequestManager.class).query(project, unfencedLowerCaseMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);for (PullRequest request: requests) {InputSuggestion suggestion = new InputSuggestion("#" + request.getNumber(), StringUtils.abbreviate(request.getTitle(), MAX_ISSUE_TITLE_LEN), null);suggestions.add(suggestion);}- } else if (fieldSpec instanceof BooleanInput) {+ } else if (fieldSpec instanceof BooleanField) {suggestions.addAll(SuggestionUtils.suggest(Lists.newArrayList("true", "false"), unfencedLowerCaseMatchWith));- } else if (fieldSpec instanceof GroupChoiceInput) {+ } else if (fieldSpec instanceof GroupChoiceField) {List<String> candidates = OneDev.getInstance(GroupManager.class).query().stream().map(it->it.getName()).collect(Collectors.toList());suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));} else if (fieldName.equals(FIELD_STATE)) {List<String> candidates = issueSetting.getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));- } else if (fieldSpec instanceof ChoiceInput) {- OneContext.push(newOneContext());+ } else if (fieldSpec instanceof ChoiceField) {+ ComponentContext.push(new ComponentContext(getComponent()));try {- List<String> candidates = new ArrayList<>(((ChoiceInput)fieldSpec).getChoiceProvider().getChoices(true).keySet());+ List<String> candidates = new ArrayList<>(((ChoiceField)fieldSpec).getChoiceProvider().getChoices(true).keySet());suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));} finally {- OneContext.pop();+ ComponentContext.pop();}} else if (fieldName.equals(FIELD_MILESTONE)) {List<String> candidates = project.getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());@@ -205,7 +203,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {} else if (fieldName.equals(FIELD_TITLE) || fieldName.equals(FIELD_DESCRIPTION)|| fieldName.equals(FIELD_COMMENT) || fieldName.equals(FIELD_VOTE_COUNT)|| fieldName.equals(FIELD_COMMENT_COUNT) || fieldName.equals(FIELD_NUMBER)- || fieldSpec instanceof NumberInput || fieldSpec instanceof TextInput) {+ || fieldSpec instanceof NumberField || fieldSpec instanceof TextField) {return null;}} catch (OneException ex) {@@ -215,34 +213,6 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {return suggestions;}- private OneContext newOneContext() {- return new OneContext(IssueQueryBehavior.this.getComponent()) {-- @Override- public Project getProject() {- return IssueQueryBehavior.this.getProject();- }-- @Override- public EditContext getEditContext(int level) {- return new EditContext() {-- @Override- public Object getInputValue(String name) {- return null;- }-- };- }-- @Override- public InputContext getInputContext() {- throw new UnsupportedOperationException();- }-- };- }-@Overrideprotected String getFencingDescription() {return "quote as literal value";diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.javaindex 5829f2d441..3897c4f5cf 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java@@ -35,10 +35,8 @@ public abstract class PatternSetAssistBehavior extends ANTLRAssistBehavior {Set<String> matches = new HashSet<>();for (Token token: terminalExpect.getRoot().getState().getMatchedTokens()) {- if (token.getType() == PatternSetLexer.Quoted)+ if (token.getType() == PatternSetLexer.Quoted || token.getType() == PatternSetLexer.NQuoted)matches.add(PatternSet.unescape(token.getText()));- else if (token.getType() == PatternSetLexer.NQuoted)- matches.add(token.getText());}String unmatched = terminalExpect.getUnmatchedText();@@ -49,7 +47,7 @@ public abstract class PatternSetAssistBehavior extends ANTLRAssistBehavior {.filter(it->!matches.contains(it.getContent())).map(it->{if (StringUtils.containsAny(it.getContent(), " \"") || it.getContent().startsWith("-")) {- InputSuggestion suggestion = it.escape(PatternSet.ESCAPE_CHARS);+ InputSuggestion suggestion = it.escape("\"");suggestion = new InputSuggestion("\"" + suggestion.getContent() + "\"",suggestion.getCaret()!=-1? suggestion.getCaret()+1: -1,suggestion.getDescription(),@@ -74,7 +72,7 @@ public abstract class PatternSetAssistBehavior extends ANTLRAssistBehavior {&& suggestions.isEmpty()) {return null;} else {- return suggestions.stream().map(it->it.escape(PatternSet.ESCAPE_CHARS)).collect(Collectors.toList());+ return suggestions.stream().map(it->it.escape("\"")).collect(Collectors.toList());}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.javaindex 7e80746820..879e35514e 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java@@ -28,7 +28,7 @@ import io.onedev.commons.codeassist.InputStatus;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.RangeUtils;-import io.onedev.server.util.OneContext;+import io.onedev.server.util.ComponentContext;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.floating.AlignTarget;@@ -136,11 +136,11 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {if (inputCaret != null) {InputStatus inputStatus = new InputStatus(inputContent, inputCaret);List<InputCompletion> suggestions;- OneContext.push(new OneContext(getComponent()));+ ComponentContext.push(new ComponentContext(getComponent()));try {suggestions = getSuggestions(new InputStatus(inputContent, inputCaret));} finally {- OneContext.pop();+ ComponentContext.pop();}int count = 0;for (Iterator<InputCompletion> it = suggestions.iterator(); it.hasNext();) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex 58ef46f45f..147756a3cf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -25,19 +25,19 @@ import org.apache.wicket.util.time.Duration;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.server.OneDev;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.BuildParam;import io.onedev.server.model.Project;+import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.entity.nav.EntityNavPanel;@@ -221,7 +221,7 @@ public abstract class BuildSidePanel extends Panel {protected void populateItem(ListItem<BuildParam> item) {BuildParam param = item.getModelObject();item.add(new Label("name", param.getName()));- if (param.getType().equals(InputSpec.SECRET))+ if (param.getType().equals(ParamSpec.SECRET))item.add(new Label("value", SecretInput.MASK));elseitem.add(new Label("value", param.getValue()));diff --git a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.javaindex 68ea8d86c9..a0f8f93735 100644--- a/server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.java@@ -14,7 +14,6 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.unbescape.javascript.JavaScriptEscape;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneException;import io.onedev.server.web.component.link.PreventDefaultAjaxLink;@@ -57,7 +56,7 @@ abstract class ConfirmActionPanel extends Panel {try {onConfirm(target);} catch (OneException e) {- error(HtmlUtils.formatAsHtml(e.getMessage()));+ error(e.getMessage());target.add(ConfirmActionPanel.this);}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.javaindex 5512cb1e63..5353cee754 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java@@ -16,7 +16,8 @@ import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.Path;+import io.onedev.server.web.editable.PathNode;@SuppressWarnings("serial")public abstract class BoardEditPanel extends Panel {@@ -68,14 +69,14 @@ public abstract class BoardEditPanel extends Panel {if (boardIndex != -1) {BoardSpec oldBoard = boards.get(boardIndex);if (!board.getName().equals(oldBoard.getName()) && getBoard(board.getName()) != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another board");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another board");}} else if (getBoard(board.getName()) != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another board");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another board");}- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {board.getColumns().clear();for (String column: board.getEditColumns())board.getColumns().add(column.equals(BoardSpec.NULL_COLUMN)?null:column);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex 99038cd7c7..019edff344 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -26,12 +26,12 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.project.comment.CommentInput;import io.onedev.server.web.component.stringchoice.StringSingleChoice;@@ -147,11 +147,6 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementreturn getIssueSetting().getFieldSpec(inputName);}- @Override- public void validateName(String inputName) {- throw new UnsupportedOperationException();- }-private Issue newIssue() {Issue issue = new Issue();issue.setUUID(uuid);@@ -173,7 +168,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementissue.setMilestone(getProject().getMilestone(milestoneChoice.getConvertedInput()));Collection<String> fieldNames = getProject().getIssueSetting().getPromptFieldsUponIssueOpen(true);- issue.setFieldValues(IssueUtils.getFieldValues(fieldEditor.getOneContext(), fieldEditor.getConvertedInput(), fieldNames));+ issue.setFieldValues(IssueUtils.getFieldValues(fieldEditor.newComponentContext(), fieldEditor.getConvertedInput(), fieldNames));setConvertedInput(issue);} catch (ConversionException e) {error(newValidationError(e));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/new-issue.css b/server-core/src/main/java/io/onedev/server/web/component/issue/create/new-issue.cssindex 38109b1cc7..afb50038ab 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/new-issue.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/new-issue.css@@ -1,3 +1,6 @@.new-issue .select2-container {width: 100%;+}+.new-issue ul.feedbackPanel {+ margin: 10px 0;}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex 10cc5aaff5..bc54b31a8b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -16,6 +16,7 @@ import org.unbescape.html.HtmlEscape;import io.onedev.commons.utils.ColorUtils;import io.onedev.server.OneDev;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.PullRequestManager;@@ -25,15 +26,15 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.SecretInput;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.model.support.issue.fieldspec.ChoiceField;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.Input;-import io.onedev.server.util.OneContext;import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.SecretInput;-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;@@ -67,10 +68,10 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {@Overrideprotected void populateItem(ListItem<String> item) {String value = item.getModelObject();- if (getField().getType().equals(InputSpec.USER)) {+ if (getField().getType().equals(FieldSpec.USER)) {UserIdent userIdent = UserIdent.of(UserFacade.of(OneDev.getInstance(UserManager.class).findByName(value)), value);item.add(new UserIdentPanel("value", userIdent, Mode.AVATAR_AND_NAME));- } else if (getField().getType().equals(InputSpec.ISSUE)) {+ } else if (getField().getType().equals(FieldSpec.ISSUE)) {Issue issue = OneDev.getInstance(IssueManager.class).find(project, Long.valueOf(value));if (issue != null) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);@@ -81,7 +82,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {} else {item.add(new Label("value", "#" + value));}- } else if (getField().getType().equals(InputSpec.BUILD)) {+ } else if (getField().getType().equals(FieldSpec.BUILD)) {Build build = OneDev.getInstance(BuildManager.class).get(Long.valueOf(value));if (build != null) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);@@ -92,7 +93,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {} else {item.add(new Label("value", "#" + value));}- } else if (getField().getType().equals(InputSpec.PULLREQUEST)) {+ } else if (getField().getType().equals(FieldSpec.PULLREQUEST)) {PullRequest request = OneDev.getInstance(PullRequestManager.class).find(project, Long.valueOf(value));if (request != null) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);@@ -105,15 +106,15 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {}} else {Label label;- if (getField().getType().equals(InputSpec.SECRET))+ if (getField().getType().equals(ParamSpec.SECRET))label = new Label("value", SecretInput.MASK);elselabel = new Label("value", value);- InputSpec fieldSpec = getIssueSetting().getFieldSpec(getField().getName());- if (fieldSpec != null && fieldSpec instanceof ChoiceInput) {- ChoiceProvider choiceProvider = ((ChoiceInput)fieldSpec).getChoiceProvider();- OneContext.push(new OneContext(this));+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(getField().getName());+ if (fieldSpec != null && fieldSpec instanceof ChoiceField) {+ ChoiceProvider choiceProvider = ((ChoiceField)fieldSpec).getChoiceProvider();+ ComponentContext.push(new ComponentContext(this));try {String backgroundColor = choiceProvider.getChoices(false).get(value);if (backgroundColor != null) {@@ -126,7 +127,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {item.add(AttributeAppender.append("class", "has-color"));}} finally {- OneContext.pop();+ ComponentContext.pop();}}item.add(label);@@ -137,7 +138,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {});add(fragment);} else {- InputSpec fieldSpec = null;+ FieldSpec fieldSpec = null;if (getField() != null)fieldSpec = getIssueSetting().getFieldSpec(getField().getName());String displayValue;@@ -153,7 +154,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {@Overridepublic Object getInputValue(String name) {Input field = getIssue().getFieldInputs().get(name);- InputSpec fieldSpec = getIssueSetting().getFieldSpec(name);+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(name);if (field != null && fieldSpec != null && field.getType().equals(EditableUtils.getDisplayName(fieldSpec.getClass()))) {return fieldSpec.convertToObject(field.getValues());} else {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex 34e3a020aa..fcff1e7f5b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -36,13 +36,14 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;import io.onedev.server.web.behavior.RunTaskBehavior;@@ -144,7 +145,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {}).add(newOnChangeBehavior(form)));List<String> customFieldNames = new ArrayList<>();- for (InputSpec field: getIssueSetting().getFieldSpecs()) {+ for (FieldSpec field: getIssueSetting().getFieldSpecs()) {if (UserMatcher.fromString(field.getCanBeChangedBy()).matches(getProject(), SecurityUtils.getUser()))customFieldNames.add(field.getName());}@@ -257,7 +258,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {elsemilestone = null;- Map<String, Object> fieldValues = IssueUtils.getFieldValues(customFieldsEditor.getOneContext(),+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(customFieldsEditor.newComponentContext(),customFieldsBean, selectedFields);OneDev.getInstance(IssueChangeManager.class).batchUpdate(getIssueIterator(), state, milestone, fieldValues, comment, SecurityUtils.getUser());@@ -321,11 +322,6 @@ abstract class BatchEditPanel extends Panel implements InputContext {return getIssueSetting().getFieldSpec(inputName);}- @Override- public void validateName(String inputName) {- throw new UnsupportedOperationException();- }-protected abstract Project getProject();@Nullablediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.javaindex e5854eca0e..c3063dd4cf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java@@ -8,8 +8,8 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.setting.GlobalIssueSetting;-import io.onedev.server.util.OneContext;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -53,7 +53,7 @@ public class BuiltInFieldsBean implements Serializable {@SuppressWarnings("unused")private static List<String> getMilestoneChoices() {- return OneContext.get().getProject().getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());+ return Project.get().getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 02f0b9b443..85bbebd919 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -53,7 +53,7 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex 1faae01575..c965f679bb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -35,17 +35,17 @@ import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.TransitionSpec;+import io.onedev.server.model.support.issue.fieldspec.ChoiceField;+import io.onedev.server.model.support.issue.fieldspec.DateField;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;-import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.util.IssueConstants;import io.onedev.server.util.Input;+import io.onedev.server.util.IssueConstants;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;-import io.onedev.server.util.inputspec.dateinput.DateInput;import io.onedev.server.web.component.issue.IssueStateLabel;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.project.comment.CommentInput;@@ -148,7 +148,7 @@ public abstract class IssueOperationsPanel extends Panel {super.onSubmit(target, form);getIssue().removeFields(transition.getRemoveFields());- Map<String, Object> fieldValues = IssueUtils.getFieldValues(editor.getOneContext(), fieldBean, trigger.getPromptFields());+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(editor.newComponentContext(), fieldBean, trigger.getPromptFields());IssueChangeManager manager = OneDev.getInstance(IssueChangeManager.class);manager.changeState(getIssue(), transition.getToState(), fieldValues, comment, SecurityUtils.getUser());onStateChanged(target);@@ -189,11 +189,11 @@ public abstract class IssueOperationsPanel extends Panel {if (strings.isEmpty()) {criterias.add(IssueQuery.quote(entry.getKey()) + " is empty");} else {- InputSpec field = issueSetting.getFieldSpec(entry.getKey());- if (field instanceof ChoiceInput && ((ChoiceInput)field).isAllowMultiple()) {+ FieldSpec field = issueSetting.getFieldSpec(entry.getKey());+ if (field instanceof ChoiceField && ((ChoiceField)field).isAllowMultiple()) {for (String string: strings)criterias.add(IssueQuery.quote(entry.getKey()) + " contains " + IssueQuery.quote(string));- } else if (!(field instanceof DateInput)) {+ } else if (!(field instanceof DateField)) {criterias.add(IssueQuery.quote(entry.getKey()) + " is " + IssueQuery.quote(strings.iterator().next()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex fc6b5bd2b7..b5e7a55546 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -222,7 +222,7 @@ public abstract class IssueSidePanel extends Panel {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- Map<String, Object> fieldValues = IssueUtils.getFieldValues(beanEditor.getOneContext(), fieldBean, getIssue().getFieldNames());+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(beanEditor.newComponentContext(), fieldBean, getIssue().getFieldNames());OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldValues, SecurityUtils.getUser());Component fieldsContainer = newFieldsContainer();IssueSidePanel.this.replace(fieldsContainer);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.htmlindex 7851f0c79e..360926ea01 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.html@@ -6,11 +6,7 @@</div><table wicket:id="stateTransitions" class="table table-hover"></table></div>- <wicket:fragment wicket:id="firstColumnFrag">- <span class="drag-indicator fa fa-reorder"></span>- <a wicket:id="link"><span wicket:id="label"></span></a>- </wicket:fragment>- <wicket:fragment wicket:id="otherColumnsFrag">+ <wicket:fragment wicket:id="columnFrag"><a wicket:id="link"><span wicket:id="label"></span></a></wicket:fragment><wicket:fragment wicket:id="viewTransitionFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.javaindex 154d740c5a..b7079e161a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java@@ -28,6 +28,7 @@ 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.unbescape.html.HtmlEscape;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;@@ -103,11 +104,14 @@ public abstract class StateTransitionListPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {- cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), true) {+ TransitionSpec transition = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, transition) {@Overrideprotected Component newLabel(String componentId) {- return new Label(componentId, StringUtils.join(rowModel.getObject().getFromStates()));+ String escaped = HtmlEscape.escapeHtml5(StringUtils.join(transition.getFromStates()));+ return new Label(componentId, "<span class='drag-indicator fa fa-reorder'></span> " + escaped)+ .setEscapeModelStrings(false);}});@@ -118,11 +122,12 @@ public abstract class StateTransitionListPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {- cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), false) {+ TransitionSpec transition = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, transition) {@Overrideprotected Component newLabel(String componentId) {- return new Label(componentId, rowModel.getObject().getToState());+ return new Label(componentId, transition.getToState());}});@@ -134,11 +139,12 @@ public abstract class StateTransitionListPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {- cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), false) {+ TransitionSpec transition = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, transition) {@Overrideprotected Component newLabel(String componentId) {- return new Label(componentId, EditableUtils.getDisplayName(rowModel.getObject().getTrigger().getClass()));+ return new Label(componentId, EditableUtils.getDisplayName(transition.getTrigger().getClass()));}});@@ -150,7 +156,7 @@ public abstract class StateTransitionListPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {- cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), false) {+ cellItem.add(new ColumnFragment(componentId, rowModel.getObject()) {@Overrideprotected Component newLabel(String componentId) {@@ -221,8 +227,8 @@ public abstract class StateTransitionListPanel extends Panel {private final int index;- public ColumnFragment(String id, TransitionSpec transition, boolean firstColumn) {- super(id, firstColumn?"firstColumnFrag":"otherColumnsFrag", StateTransitionListPanel.this);+ public ColumnFragment(String id, TransitionSpec transition) {+ super(id, "columnFrag", StateTransitionListPanel.this);this.index = getTransitionSpecIndex(transition);Preconditions.checkState(this.index != -1);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.javaindex 5324d33eb4..61d50f6e4c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java@@ -13,10 +13,10 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.issue.TransitionSpec;-import io.onedev.server.model.support.setting.GlobalIssueSetting;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;@@ -119,11 +119,6 @@ abstract class TransitionEditPanel extends Panel implements InputContext {return getIssueSetting().getFieldSpec(inputName);}- @Override- public void validateName(String inputName) {- throw new UnsupportedOperationException();- }-protected abstract void onChanged(AjaxRequestTarget target);protected abstract void onCancel(AjaxRequestTarget target);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.htmlindex e485d35007..65160c1dd6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html@@ -7,8 +7,8 @@<input wicket:id="title" type="text" placeholder="Input title" class="form-control"></div><div class="actions">- <input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/>- <input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/>+ <a wicket:id="save" title="Save" value="Save" class="btn btn-success"><i class="fa fa-check"></i></a>+ <a wicket:id="cancel" title="Cancel" type="button" value="Cancel" class="btn btn-danger"><i class="fa fa-times"></i></a></div></form></wicket:fragment>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css b/server-core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.cssindex 56d4007b78..61b2bd04d4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css@@ -21,3 +21,16 @@font-weight: normal;font-size: 14px;}+.issue-title form {+ position: relative;+ padding-right: 100px;+}+.issue-title form .actions {+ position: absolute;+ top: 0;+ right: 0;+ margin: 0;+}+.issue-title form .actions a:first-child {+ margin-right: 0;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.javaindex d1e0e287d6..1860eb351d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java@@ -18,11 +18,14 @@ import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobManager;import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.scriptidentity.JobIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentityAware;import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;@@ -51,6 +54,7 @@ public class RunJobLink extends AjaxLink<Void> {@Overridepublic void onClick(AjaxRequestTarget target) {CISpec ciSpec = Preconditions.checkNotNull(getProject().getCISpec(commitId));+Job job = Preconditions.checkNotNull(ciSpec.getJobMap().get(jobName));if (!job.getParamSpecs().isEmpty()) {Serializable paramBean;@@ -77,15 +81,15 @@ public class RunJobLink extends AjaxLink<Void> {}@Override- public InputSpec getInputSpec(String inputName) {- return Preconditions.checkNotNull(job.getParamSpecMap().get(inputName));+ public ParamSpec getInputSpec(String paramName) {+ return Preconditions.checkNotNull(job.getParamSpecMap().get(paramName));}@Override- public void validateName(String inputName) {- throw new UnsupportedOperationException();+ public ScriptIdentity getScriptIdentity() {+ return new JobIdentity(getProject(), commitId);}-+};} else {Build build = OneDev.getInstance(JobManager.class).submit(getProject(), commitId,@@ -106,7 +110,7 @@ public class RunJobLink extends AjaxLink<Void> {super.onDetach();}- private abstract class ParamEditModalPanel extends BeanEditModalPanel implements InputContext {+ private abstract class ParamEditModalPanel extends BeanEditModalPanel implements InputContext, ScriptIdentityAware {public ParamEditModalPanel(AjaxRequestTarget target, Serializable bean) {super(target, bean);diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.javaindex 484ac735a9..67410652c4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java@@ -19,7 +19,8 @@ import io.onedev.server.model.User;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.page.admin.user.UserListPage;import io.onedev.server.web.util.ConfirmOnClick;@@ -72,15 +73,15 @@ public class ProfileEditPanel extends GenericPanel<User> {UserManager userManager = OneDev.getInstance(UserManager.class);User userWithSameName = userManager.findByName(user.getName());if (userWithSameName != null && !userWithSameName.equals(user)) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another user.");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another user.");}User userWithSameEmail = userManager.findByEmail(user.getEmail());if (userWithSameEmail != null && !userWithSameEmail.equals(user)) {- editor.getErrorContext(new PathElement.Named("email"))- .addError("This email has already been used by another user.");+ editor.error(new Path(new PathNode.Named("email")),+ "This email has already been used by another user.");}- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {userManager.save(user, oldName);Session.get().success("Profile updated");setResponsePage(getPage().getClass(), getPage().getPageParameters());diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex 4b774dc573..94c0240ac2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -33,9 +33,9 @@ import org.apache.wicket.validation.IValidator;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;-import io.onedev.server.util.OneContext;-import io.onedev.server.web.editable.PathElement.Named;+import io.onedev.server.web.editable.PathNode.Named;import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.Vertical;@@ -109,10 +109,10 @@ public class BeanEditor extends ValueEditor<Serializable> {}}validate();- if (!hasErrors(true))+ if (isValid())send(this, Broadcast.BUBBLE, new BeanUpdating(propertyUpdating.getHandler()));else- clearErrors(true);+ clearErrors();}}@@ -162,13 +162,13 @@ public class BeanEditor extends ValueEditor<Serializable> {Serializable propertyValue;- OneContext context = new OneContext(this);+ ComponentContext context = new ComponentContext(this);- OneContext.push(context);+ ComponentContext.push(context);try {propertyValue = (Serializable) property.getDescriptor().getPropertyValue(getModelObject());} finally {- OneContext.pop();+ ComponentContext.pop();}PropertyEditor<Serializable> propertyEditor = property.renderForEdit("value", Model.of(propertyValue));valueContainer.add(propertyEditor);@@ -228,7 +228,7 @@ public class BeanEditor extends ValueEditor<Serializable> {protected void onConfigure() {super.onConfigure();setVisible(!property.getDescriptor().isPropertyExcluded()- && property.getDescriptor().isPropertyVisible(new OneContext(this), descriptor));+ && property.getDescriptor().isPropertyVisible(new ComponentContext(this), descriptor));}};@@ -287,16 +287,13 @@ public class BeanEditor extends ValueEditor<Serializable> {@Overridepublic void validate(IValidatable<Serializable> validatable) {- OneContext.push(getOneContext());+ ComponentContext.push(newComponentContext());try {Validator validator = AppLoader.getInstance(Validator.class);- for (ConstraintViolation<Serializable> violation: validator.validate(validatable.getValue())) {- ErrorContext errorContext = getErrorContext(new ValuePath(violation.getPropertyPath()));- if (errorContext != null)- errorContext.addError(violation.getMessage());- }+ for (ConstraintViolation<Serializable> violation: validator.validate(validatable.getValue()))+ error(new Path(violation.getPropertyPath()), violation.getMessage());} finally {- OneContext.pop();+ ComponentContext.pop();}}@@ -317,21 +314,24 @@ public class BeanEditor extends ValueEditor<Serializable> {}@Override- public ErrorContext getErrorContext(PathElement element) {- PathElement.Named namedElement = (Named) element;- return visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<Serializable>, PropertyEditor<Serializable>>() {+ public void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {+ PathNode.Named named = (Named) propertyNode;+ PropertyEditor<?> propertyEditor = visitChildren(PropertyEditor.class,+ new IVisitor<PropertyEditor<Serializable>, PropertyEditor<Serializable>>() {@Overridepublic void component(PropertyEditor<Serializable> object, IVisit<PropertyEditor<Serializable>> visit) {- if (object.getDescriptor().getPropertyName().equals(namedElement.getName()) && object.isVisibleInHierarchy())+ if (object.getDescriptor().getPropertyName().equals(named.getName()) && object.isVisibleInHierarchy())visit.stop(object);elsevisit.dontGoDeeper();}});+ if (propertyEditor != null)+ propertyEditor.error(pathInProperty, errorMessage);}-+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);@@ -357,18 +357,18 @@ public class BeanEditor extends ValueEditor<Serializable> {return bean;}- public OneContext getOneContext() {- return new OneContext(this) {+ public ComponentContext newComponentContext() {+ return new ComponentContext(this) {@Override- public OneContext getPropertyContext(String propertyName) {+ public ComponentContext getChildContext(String childName) {for (Component groupContainer: groupsView) {RepeatingView propertiesView = (RepeatingView) groupContainer.get("content").get("properties");for (Component item: propertiesView) {@SuppressWarnings("unchecked")PropertyContext<Serializable> propertyContext = (PropertyContext<Serializable>) item.getDefaultModelObject();- if (propertyContext.getPropertyName().equals(propertyName))- return new OneContext(item);+ if (propertyContext.getPropertyName().equals(childName))+ return new ComponentContext(item);}}return null;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.javaindex 4b6428ef65..5f9fb616f6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java@@ -20,7 +20,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import io.onedev.server.util.EditContext;-import io.onedev.server.util.OneContext;+import io.onedev.server.util.ComponentContext;import io.onedev.server.web.editable.annotation.OmitName;@SuppressWarnings("serial")@@ -78,7 +78,7 @@ public class BeanViewer extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(property.isPropertyVisible(new OneContext(this), descriptor) && !property.isPropertyExcluded());+ setVisible(property.isPropertyVisible(new ComponentContext(this), descriptor) && !property.isPropertyExcluded());}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BranchPatternsEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/BranchPatternsEditSupport.javadeleted file mode 100644index 7192245eb2..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/BranchPatternsEditSupport.java+++ /dev/null@@ -1,82 +0,0 @@-package io.onedev.server.web.editable;--import java.lang.reflect.Method;-import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.model.IModel;--import com.google.common.collect.Lists;--import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.model.Project;-import io.onedev.server.web.behavior.PatternSetAssistBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;-import io.onedev.server.web.editable.annotation.BranchPatterns;-import io.onedev.server.web.editable.string.StringPropertyEditor;-import io.onedev.server.web.editable.string.StringPropertyViewer;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.util.SuggestionUtils;--@SuppressWarnings("serial")-public class BranchPatternsEditSupport implements EditSupport {-- @Override- public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {- Method propertyGetter = descriptor.getPropertyGetter();- BranchPatterns branchPatterns = propertyGetter.getAnnotation(BranchPatterns.class);- if (branchPatterns != null) {- if (propertyGetter.getReturnType() == String.class) {- return new PropertyContext<String>(descriptor) {-- @Override- public PropertyViewer renderForView(String componentId, IModel<String> model) {- return new StringPropertyViewer(componentId, descriptor, model.getObject());- }-- @Override- public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {-- @Override- protected InputAssistBehavior getInputAssistBehavior() {- return new PatternSetAssistBehavior() {-- @Override- protected List<InputSuggestion> suggest(String matchWith) {- if (getPage() instanceof ProjectPage) {- Project project = ((ProjectPage)getPage()).getProject();- return SuggestionUtils.suggestBranches(project, matchWith);- } else {- return new ArrayList<>();- }- }-- @Override- protected List<String> getHints(TerminalExpect terminalExpect) {- return Lists.newArrayList("Use * or ? for wildcard match");- }-- };- }-- };- }-- };- } else {- throw new RuntimeException("Annotation 'BranchPatterns' should be applied to property "- + "of type 'String'");- }- } else {- return null;- }- }-- @Override- public int getPriority() {- return DEFAULT_PRIORITY;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ErrorContext.java b/server-core/src/main/java/io/onedev/server/web/editable/ErrorContext.javadeleted file mode 100644index f5f531399c..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/ErrorContext.java+++ /dev/null@@ -1,17 +0,0 @@-package io.onedev.server.web.editable;--public interface ErrorContext {-- void addError(String errorMessage);-- boolean hasErrors(boolean recursive);-- /**- * Get error context of specified element- * @param element- * @return- * error context of specified path, <tt>null</tt> if error of the element should be ignored- * (for instance when visibility of the property depends on another property, or is excluded etc.)- */- ErrorContext getErrorContext(PathElement element);-}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/TagPatternsEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativeEditSupport.javasimilarity index 50%rename from server-core/src/main/java/io/onedev/server/web/editable/TagPatternsEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/InterpolativeEditSupport.javaindex 6cde20c6c0..f1926d929d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/TagPatternsEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativeEditSupport.java@@ -1,7 +1,6 @@package io.onedev.server.web.editable;import java.lang.reflect.Method;-import java.util.ArrayList;import java.util.List;import org.apache.wicket.model.IModel;@@ -9,23 +8,21 @@ import org.apache.wicket.model.IModel;import com.google.common.collect.Lists;import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.model.Project;-import io.onedev.server.web.behavior.PatternSetAssistBehavior;+import io.onedev.commons.utils.ReflectionUtils;+import io.onedev.server.web.behavior.InterpolativeAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;-import io.onedev.server.web.editable.annotation.TagPatterns;+import io.onedev.server.web.editable.annotation.Interpolative;import io.onedev.server.web.editable.string.StringPropertyEditor;import io.onedev.server.web.editable.string.StringPropertyViewer;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.util.SuggestionUtils;@SuppressWarnings("serial")-public class TagPatternsEditSupport implements EditSupport {+public class InterpolativeEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {Method propertyGetter = descriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(TagPatterns.class) != null) {+ Interpolative interpolative = propertyGetter.getAnnotation(Interpolative.class);+ if (interpolative != null) {if (propertyGetter.getReturnType() == String.class) {return new PropertyContext<String>(descriptor) {@@ -40,21 +37,30 @@ public class TagPatternsEditSupport implements EditSupport {@Overrideprotected InputAssistBehavior getInputAssistBehavior() {- return new PatternSetAssistBehavior() {+ return new InterpolativeAssistBehavior() {+ @SuppressWarnings("unchecked")@Override- protected List<InputSuggestion> suggest(String matchWith) {- if (getPage() instanceof ProjectPage) {- Project project = ((ProjectPage)getPage()).getProject();- return SuggestionUtils.suggestTags(project, matchWith);+ protected List<InputSuggestion> suggestVariables(String matchWith) {+ String suggestionMethod = interpolative.variableSuggester();+ if (suggestionMethod.length() != 0) {+ return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});} else {- return new ArrayList<>();+ return Lists.newArrayList();}}+ @SuppressWarnings("unchecked")@Override- protected List<String> getHints(TerminalExpect terminalExpect) {- return Lists.newArrayList("Use * or ? for wildcard match");+ protected List<InputSuggestion> suggestLiterals(String matchWith) {+ String suggestionMethod = interpolative.literalSuggester();+ if (suggestionMethod.length() != 0) {+ return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});+ } else {+ return Lists.newArrayList();+ }}};@@ -64,9 +70,11 @@ public class TagPatternsEditSupport implements EditSupport {}};+ } else if (propertyGetter.getReturnType() == List.class) {+ return null;} else {- throw new RuntimeException("Annotation 'TagPatterns' should be applied to property "- + "with type 'List<String>' or 'String'");+ throw new RuntimeException("Annotation 'Interpolative' should be applied to property "+ + "of type 'String' or 'List<String>'");}} else {return null;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.javanew file mode 100644index 0000000000..a646130251--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java@@ -0,0 +1,103 @@+package io.onedev.server.web.editable;++import java.lang.reflect.Method;+import java.util.List;++import org.apache.wicket.model.IModel;++import com.google.common.collect.Lists;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.codeassist.parser.TerminalExpect;+import io.onedev.commons.utils.ReflectionUtils;+import io.onedev.server.web.behavior.InterpolativePatternSetAssistBehavior;+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;+import io.onedev.server.web.editable.annotation.Interpolative;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.editable.string.StringPropertyEditor;+import io.onedev.server.web.editable.string.StringPropertyViewer;++@SuppressWarnings("serial")+public class InterpolativePatternsEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ Method propertyGetter = descriptor.getPropertyGetter();+ Interpolative interpolative = propertyGetter.getAnnotation(Interpolative.class);+ Patterns patterns = propertyGetter.getAnnotation(Patterns.class);++ if (interpolative != null && patterns != null) {+ if (propertyGetter.getReturnType() == String.class) {+ return new PropertyContext<String>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, IModel<String> model) {+ return new StringPropertyViewer(componentId, descriptor, model.getObject());+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new StringPropertyEditor(componentId, descriptor, model) {++ @Override+ protected InputAssistBehavior getInputAssistBehavior() {+ return new InterpolativePatternSetAssistBehavior() {++ @SuppressWarnings("unchecked")+ @Override+ protected List<InputSuggestion> suggestPatterns(String matchWith) {+ String suggestionMethod = patterns.suggester();+ if (suggestionMethod.length() != 0) {+ return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});+ } else {+ return Lists.newArrayList();+ }+ }++ @SuppressWarnings("unchecked")+ @Override+ protected List<InputSuggestion> suggestVariables(String matchWith) {+ String suggestionMethod = interpolative.variableSuggester();+ if (suggestionMethod.length() != 0) {+ return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});+ } else {+ return Lists.newArrayList();+ }+ }++ @Override+ protected List<String> getHints(TerminalExpect terminalExpect) {+ char interpolativeMark = io.onedev.server.util.interpolative.Interpolative.MARK;+ return Lists.newArrayList(+ "Pattern containing spaces or starting with dash needs to be quoted",+ "Use * or ? for wildcard match",+ String.format("Type '%c' to start inserting variable", interpolativeMark),+ String.format("Type '\\%c' to input normal '%c' character",+ interpolativeMark, interpolativeMark)+ );+ }++ };+ }++ };+ }++ };+ } else {+ throw new RuntimeException("Annotation 'Interpolative' and 'Patterns' should be applied to property "+ + "of type 'String'");+ }+ } else {+ return null;+ }+ }++ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY - 1;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/Path.java b/server-core/src/main/java/io/onedev/server/web/editable/Path.javanew file mode 100644index 0000000000..e240a3fb27--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/Path.java@@ -0,0 +1,62 @@+package io.onedev.server.web.editable;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Arrays;+import java.util.List;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import com.google.common.collect.Lists;++@SuppressWarnings("serial")+public class Path implements Serializable {++ private List<PathNode> nodes = new ArrayList<>();++ public Path(PathNode...nodes) {+ this.nodes = Arrays.asList(nodes);+ }++ public Path(List<PathNode> nodes) {+ this.nodes = nodes;+ }++ public Path(Path path) {+ this.nodes = new ArrayList<>(path.getNodes());+ }++ public Path(javax.validation.Path path) {+ for (javax.validation.Path.Node node: path) {+ if (node.getIndex() != null)+ nodes.add(new PathNode.Indexed(node.getIndex()));+ if (node.getName() != null)+ nodes.add(new PathNode.Named(node.getName()));+ }+ }++ public List<PathNode> getNodes() {+ return nodes;+ }++ @Nullable+ public PathNode takeNode() {+ if (!nodes.isEmpty())+ return nodes.remove(0);+ else+ return null;+ }++ @Override+ public String toString() {+ return nodes.stream().map(it->it.toString()).collect(Collectors.joining(" -> "));+ }++ public static String describe(PathNode propertyNode, Path pathInProperty) {+ List<PathNode> nodes = Lists.newArrayList(propertyNode);+ nodes.addAll(pathInProperty.getNodes());+ return new Path(nodes).toString();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PathElement.java b/server-core/src/main/java/io/onedev/server/web/editable/PathElement.javadeleted file mode 100644index 78c97873c4..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/PathElement.java+++ /dev/null@@ -1,49 +0,0 @@-package io.onedev.server.web.editable;--import java.io.Serializable;--import com.google.common.base.Preconditions;--public interface PathElement extends Serializable {-- @SuppressWarnings("serial")- public static class Named implements PathElement {-- private final String name;-- public Named(String name) {- this.name = Preconditions.checkNotNull(name);- }-- public String getName() {- return name;- }-- @Override- public String toString() {- return name;- }-- }-- @SuppressWarnings("serial")- public static class Indexed implements PathElement {-- private final int index;-- public Indexed(int index) {- this.index = index;- }-- public int getIndex() {- return index;- }-- @Override- public String toString() {- return String.valueOf(index);- }-- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PathNode.java b/server-core/src/main/java/io/onedev/server/web/editable/PathNode.javanew file mode 100644index 0000000000..fbc52d7074--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/PathNode.java@@ -0,0 +1,90 @@+package io.onedev.server.web.editable;++import java.io.Serializable;++import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;++import com.google.common.base.Preconditions;++public interface PathNode extends Serializable {++ @SuppressWarnings("serial")+ public static class Named implements PathNode {++ private final String name;++ public Named(String name) {+ this.name = Preconditions.checkNotNull(name);+ }++ public String getName() {+ return name;+ }++ @Override+ public String toString() {+ return name;+ }++ @Override+ public boolean equals(Object other) {+ if (!(other instanceof Named))+ return false;+ if (this == other)+ return true;+ Named otherElement = (Named) other;+ return new EqualsBuilder()+ .append(name, otherElement.getName())+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(name)+ .toHashCode();+ }++ }++ @SuppressWarnings("serial")+ public static class Indexed implements PathNode {++ private final int index;++ public Indexed(int index) {+ this.index = index;+ }++ public int getIndex() {+ return index;+ }++ @Override+ public String toString() {+ return "item #" + (index+1);+ }++ @Override+ public boolean equals(Object other) {+ if (!(other instanceof Indexed))+ return false;+ if (this == other)+ return true;+ Indexed otherElement = (Indexed) other;+ return new EqualsBuilder()+ .append(index, otherElement.getIndex())+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(index)+ .toHashCode();+ }++ }++}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 4c268e4667..308be1ff07 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@@ -43,7 +43,7 @@ public class PatternsEditSupport implements EditSupport {@SuppressWarnings("unchecked")@Overrideprotected List<InputSuggestion> suggest(String matchWith) {- String suggestionMethod = patterns.value();+ String suggestionMethod = patterns.suggester();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/ProjectPatternsEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/ProjectPatternsEditSupport.javadeleted file mode 100644index cccba0c99c..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/ProjectPatternsEditSupport.java+++ /dev/null@@ -1,73 +0,0 @@-package io.onedev.server.web.editable;--import java.lang.reflect.Method;-import java.util.List;--import org.apache.wicket.model.IModel;--import com.google.common.collect.Lists;--import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.web.behavior.PatternSetAssistBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;-import io.onedev.server.web.editable.annotation.ProjectPatterns;-import io.onedev.server.web.editable.string.StringPropertyEditor;-import io.onedev.server.web.editable.string.StringPropertyViewer;-import io.onedev.server.web.util.SuggestionUtils;--@SuppressWarnings("serial")-public class ProjectPatternsEditSupport implements EditSupport {-- @Override- public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {- Method propertyGetter = descriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(ProjectPatterns.class) != null) {- if (propertyGetter.getReturnType() == String.class) {- return new PropertyContext<String>(descriptor) {-- @Override- public PropertyViewer renderForView(String componentId, IModel<String> model) {- return new StringPropertyViewer(componentId, descriptor, model.getObject());- }-- @Override- public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {-- @Override- protected InputAssistBehavior getInputAssistBehavior() {- return new PatternSetAssistBehavior() {-- @Override- protected List<InputSuggestion> suggest(String matchWith) {- return SuggestionUtils.suggestProjects(matchWith);- }-- @Override- protected List<String> getHints(TerminalExpect terminalExpect) {- return Lists.newArrayList("Use * or ? for wildcard match");- }-- };- }-- };- }-- };- } else {- throw new RuntimeException("Annotation 'ProjectPatterns' should be applied to property "- + "of type 'String'");- }- } else {- return null;- }- }-- @Override- public int getPriority() {- return DEFAULT_PRIORITY;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.javaindex 9e0430be61..bc5f4f7490 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java@@ -13,7 +13,7 @@ import org.hibernate.proxy.HibernateProxyHelper;import com.google.common.collect.Lists;import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.server.util.OneContext;+import io.onedev.server.util.ComponentContext;@SuppressWarnings("serial")public abstract class PropertyContext<T> implements Serializable {@@ -150,8 +150,8 @@ public abstract class PropertyContext<T> implements Serializable {return descriptor.isPropertyRequired();}- public boolean isPropertyVisible(OneContext oneContext, BeanDescriptor beanDescriptor) {- return descriptor.isPropertyVisible(oneContext, beanDescriptor);+ public boolean isPropertyVisible(ComponentContext componentContext, BeanDescriptor beanDescriptor) {+ return descriptor.isPropertyVisible(componentContext, beanDescriptor);}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.javaindex e858cbabee..001825d1d0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java@@ -21,7 +21,7 @@ import io.onedev.commons.utils.HtmlUtils;import io.onedev.commons.utils.ReflectionUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.util.OneContext;+import io.onedev.server.util.ComponentContext;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ShowCondition;@@ -125,16 +125,16 @@ public class PropertyDescriptor implements Serializable {return null;}- public boolean isPropertyVisible(OneContext oneContext, BeanDescriptor beanDescriptor) {- return isPropertyVisible(oneContext, beanDescriptor, Sets.newHashSet());+ public boolean isPropertyVisible(ComponentContext componentContext, BeanDescriptor beanDescriptor) {+ return isPropertyVisible(componentContext, beanDescriptor, Sets.newHashSet());}- private boolean isPropertyVisible(OneContext oneContext, BeanDescriptor beanDescriptor, Set<String> checkedPropertyNames) {+ private boolean isPropertyVisible(ComponentContext componentContext, BeanDescriptor beanDescriptor, Set<String> checkedPropertyNames) {if (!checkedPropertyNames.add(getPropertyName()))return false;Set<String> prevDependencyPropertyNames = new HashSet<>(getDependencyPropertyNames());- OneContext.push(oneContext);+ ComponentContext.push(componentContext);try {/** Sometimes, the dependency may include properties introduced while evaluating available choices@@ -147,13 +147,13 @@ public class PropertyDescriptor implements Serializable {return false;for (String dependencyPropertyName: getDependencyPropertyNames()) {Set<String> copyOfCheckedPropertyNames = new HashSet<>(checkedPropertyNames);- if (!beanDescriptor.getProperty(dependencyPropertyName).isPropertyVisible(oneContext, beanDescriptor, copyOfCheckedPropertyNames))+ if (!beanDescriptor.getProperty(dependencyPropertyName).isPropertyVisible(componentContext, beanDescriptor, copyOfCheckedPropertyNames))return false;}return true;} finally {getDependencyPropertyNames().addAll(prevDependencyPropertyNames);- OneContext.pop();+ ComponentContext.pop();}}@@ -181,13 +181,13 @@ public class PropertyDescriptor implements Serializable {public String getDescription(Component component) {String description = getDescription();if (description != null) {- OneContext.push(new OneContext(component));+ ComponentContext.push(new ComponentContext(component));try {description = Application.get().getResourceSettings().getLocalizer().getString(description, component, description);description = StringUtils.replace(description, "$docRoot", OneDev.getInstance().getDocRoot());return HtmlUtils.clean(description).body().html();} finally {- OneContext.pop();+ ComponentContext.pop();}} else {return null;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.javaindex b5ce614a4c..14c491e09d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java@@ -15,7 +15,7 @@ import org.apache.wicket.validation.INullAcceptingValidator;import org.apache.wicket.validation.IValidatable;import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.server.util.OneContext;+import io.onedev.server.util.ComponentContext;@SuppressWarnings("serial")public abstract class PropertyEditor<T> extends ValueEditor<T> {@@ -36,7 +36,7 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {@Overridepublic void validate(IValidatable<T> validatable) {- OneContext.push(new OneContext(PropertyEditor.this));+ ComponentContext.push(new ComponentContext(PropertyEditor.this));try {Validator validator = AppLoader.getInstance(Validator.class);Set<?> violations = validator.validateValue(@@ -46,10 +46,10 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {for (Object each: violations) {ConstraintViolation<?> violation = (ConstraintViolation<?>) each;- addError(violation.getMessage());+ error(violation.getMessage());}} finally {- OneContext.pop();+ ComponentContext.pop();}}@@ -60,7 +60,7 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {@Overrideprotected String load() {String classes = " property-editor editable ";- if (hasErrors(false))+ if (hasErrorMessage())classes += "has-error";return classes;}@@ -81,10 +81,10 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {protected void onPropertyUpdating(IPartialPageRequestHandler target) {validate();- if (!hasErrors(true))+ if (isValid())send(getParent(), Broadcast.BUBBLE, new PropertyUpdating(target, descriptor.getPropertyName()));else- clearErrors(true);+ clearErrors();}public PropertyDescriptor getDescriptor() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ValueEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/ValueEditor.javaindex ff296556ec..11a43e7f64 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/ValueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/ValueEditor.java@@ -1,7 +1,5 @@package io.onedev.server.web.editable;-import javax.annotation.Nullable;-import org.apache.wicket.Component;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -12,62 +10,30 @@ import org.apache.wicket.util.visit.IVisit;import org.apache.wicket.util.visit.IVisitor;@SuppressWarnings("serial")-public abstract class ValueEditor<T> extends FormComponentPanel<T> implements ErrorContext {+public abstract class ValueEditor<T> extends FormComponentPanel<T> {public ValueEditor(String id, IModel<T> model) {super(id, model);setConvertedInput(model.getObject());}- /**- * Get error context of specified path- * @param path- * @return- * error context of specified path, <tt>null</tt> if error on the path should be ignored (for instance- * when visibility of the property depends on another property, or is excluded etc.)- */- public @Nullable ErrorContext getErrorContext(ValuePath path) {- ErrorContext context = this;- for (PathElement element: path.getElements()) {- ErrorContext elementContext = context.getErrorContext(element);- if (elementContext != null)- context = elementContext;- else- return null;- }- return context;- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new EditableResourceReference()));}- public void clearErrors(boolean recursive) {- if (recursive) {- visitComponentsPostOrder(this, new IVisitor<Component, Void>() {-- @Override- public void component(Component formComponent, IVisit<Void> visit) {- formComponent.getFeedbackMessages().clear();- }-- });- } else {- getFeedbackMessages().clear();- }+ public void clearErrors() {+ visitComponentsPostOrder(this, new IVisitor<Component, Void>() {++ @Override+ public void component(Component formComponent, IVisit<Void> visit) {+ formComponent.getFeedbackMessages().clear();+ }++ });}- /**- * Get error context for specified path element.- *- * @return- * error context of specified path element, or <tt>null</tt> if error context- * for specified path segment can not be found- */- public abstract @Nullable ErrorContext getErrorContext(PathElement element);-protected abstract T convertInputToValue() throws ConversionException;@Override@@ -79,17 +45,16 @@ public abstract class ValueEditor<T> extends FormComponentPanel<T> implements Er}}- @Override- public void addError(String errorMessage) {- error(errorMessage);- }-- @Override- public boolean hasErrors(boolean recursive) {- if (recursive)- return !isValid();+ public final void error(Path path, String errorMessage) {+ PathNode node = path.takeNode();+ if (node != null)+ error(node, path, errorMessage);else- return hasErrorMessage();+ error(errorMessage);}+ protected void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {+ error(Path.describe(propertyNode, pathInProperty) + ": " + errorMessage);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ValuePath.java b/server-core/src/main/java/io/onedev/server/web/editable/ValuePath.javadeleted file mode 100644index 1e3946e8bd..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/ValuePath.java+++ /dev/null@@ -1,45 +0,0 @@-package io.onedev.server.web.editable;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Arrays;-import java.util.List;--import javax.validation.Path;--@SuppressWarnings("serial")-public class ValuePath implements Serializable {-- private List<PathElement> elements = new ArrayList<>();-- public ValuePath(PathElement...elements) {- this.elements = Arrays.asList(elements);- }-- public ValuePath(List<PathElement> elements) {- this.elements = elements;- }-- public ValuePath(ValuePath valuePath) {- this.elements = new ArrayList<>(valuePath.getElements());- }-- public ValuePath(Path validationPath) {- for (Path.Node node: validationPath) {- if (node.getIndex() != null)- elements.add(new PathElement.Indexed(node.getIndex()));- if (node.getName() != null)- elements.add(new PathElement.Named(node.getName()));- }- }-- public List<PathElement> getElements() {- return elements;- }-- @Override- public String toString() {- return elements.toString();- }--}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 ad6ddc135e..caaa95ab5f 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@@ -10,6 +10,6 @@ import java.lang.annotation.Target;public @interface BuildChoice {// optionally specify a method to return project for build query- String value() default "";+ String project() default "";}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Script.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Code.javasimilarity index 85%rename from server-core/src/main/java/io/onedev/server/web/editable/annotation/Script.javarename to server-core/src/main/java/io/onedev/server/web/editable/annotation/Code.javaindex 520f88d479..f5f6168406 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Script.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Code.java@@ -15,11 +15,14 @@ import java.lang.annotation.Target;@Target({ElementType.METHOD, ElementType.FIELD})@Retention(RetentionPolicy.RUNTIME)-public @interface Script {+public @interface Code {String GROOVY = "Groovy";String SHELL = "Shell";- String value();+ String language();++ String variableProvider() default "";+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BranchPatterns.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Interpolative.javasimilarity index 65%rename from server-core/src/main/java/io/onedev/server/web/editable/annotation/BranchPatterns.javarename to server-core/src/main/java/io/onedev/server/web/editable/annotation/Interpolative.javaindex 64171adab5..dd1433b1e8 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BranchPatterns.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Interpolative.java@@ -8,16 +8,18 @@ import java.lang.annotation.Target;import javax.validation.Constraint;import javax.validation.Payload;-import io.onedev.server.util.validation.BranchPatternsValidator;+import io.onedev.server.util.validation.InterpolativeValidator;@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=BranchPatternsValidator.class)-public @interface BranchPatterns {+@Constraint(validatedBy=InterpolativeValidator.class)+public @interface Interpolative {- String value() default "";+ String message() default "";- String message() default "Malformed branch patterns";+ String literalSuggester() default "";++ String variableSuggester() default "";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Numeric.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Numeric.javaindex 6442a25c59..c611234633 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Numeric.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Numeric.java@@ -5,7 +5,21 @@ import java.lang.annotation.Retention;import java.lang.annotation.RetentionPolicy;import java.lang.annotation.Target;+import javax.validation.Constraint;+import javax.validation.Payload;++import io.onedev.server.util.validation.NumericValidator;+@Target({ElementType.METHOD, ElementType.FIELD})@Retention(RetentionPolicy.RUNTIME)+@Constraint(validatedBy=NumericValidator.class)public @interface Numeric {+ boolean interpolative() default false;++ String message() default "Invalid number";++ Class<?>[] groups() default {};++ Class<? extends Payload>[] payload() default {};+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Patterns.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Patterns.javaindex 3fe3872115..5c7d80008d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Patterns.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Patterns.java@@ -17,7 +17,9 @@ public @interface Patterns {String message() default "Malformed patterns";- String value() default "";+ boolean interpolative() default false;++ String suggester() default "";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/ProjectPatterns.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/ProjectPatterns.javadeleted file mode 100644index 6d545b5ce6..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/ProjectPatterns.java+++ /dev/null@@ -1,24 +0,0 @@-package io.onedev.server.web.editable.annotation;--import java.lang.annotation.ElementType;-import java.lang.annotation.Retention;-import java.lang.annotation.RetentionPolicy;-import java.lang.annotation.Target;--import javax.validation.Constraint;-import javax.validation.Payload;--import io.onedev.server.util.validation.ProjectPatternsValidator;--@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})-@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=ProjectPatternsValidator.class)-public @interface ProjectPatterns {-- String message() default "Malformed project patterns";-- Class<?>[] groups() default {};-- Class<? extends Payload>[] payload() default {};--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/ReviewRequirement.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/ReviewRequirement.javaindex 3e2fabb536..1763ce7b03 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/ReviewRequirement.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/ReviewRequirement.java@@ -15,7 +15,7 @@ import io.onedev.server.util.validation.ReviewRequirementValidator;@Constraint(validatedBy=ReviewRequirementValidator.class)public @interface ReviewRequirement {- String message() default "Malformed review requirement spec";+ String message() default "";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/ScriptChoice.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/ScriptChoice.javanew file mode 100644index 0000000000..fd24616362--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/ScriptChoice.java@@ -0,0 +1,12 @@+package io.onedev.server.web.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Target({ElementType.METHOD, ElementType.FIELD})+@Retention(RetentionPolicy.RUNTIME)+public @interface ScriptChoice {++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/TagPatterns.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/TagPatterns.javadeleted file mode 100644index 26f542de72..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/TagPatterns.java+++ /dev/null@@ -1,24 +0,0 @@-package io.onedev.server.web.editable.annotation;--import java.lang.annotation.ElementType;-import java.lang.annotation.Retention;-import java.lang.annotation.RetentionPolicy;-import java.lang.annotation.Target;--import javax.validation.Constraint;-import javax.validation.Payload;--import io.onedev.server.util.validation.TagPatternsValidator;--@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})-@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=TagPatternsValidator.class)-public @interface TagPatterns {-- String message() default "Malformed tag patterns";-- Class<?>[] groups() default {};-- Class<? extends Payload>[] payload() default {};--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.javaindex 5a431bb690..bff5300cc2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java@@ -13,13 +13,14 @@ import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.model.IModel;import org.apache.wicket.util.convert.ConversionException;-import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.BeanUpdating;+import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.ValueEditor;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.annotation.ExcludedProperties;@SuppressWarnings("serial")@@ -121,8 +122,8 @@ public class BeanPropertyEditor extends PropertyEditor<Serializable> {}@Override- public ErrorContext getErrorContext(PathElement element) {- return ((ErrorContext) get(BEAN_EDITOR_ID)).getErrorContext(element);+ public void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {+ ((ValueEditor<?>) get(BEAN_EDITOR_ID)).error(pathInProperty, errorMessage);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javaindex 51163e9361..41a1c0644b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java@@ -14,7 +14,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;-import org.apache.wicket.feedback.FeedbackMessage;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;@@ -32,13 +31,14 @@ import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.EditableUtils;-import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.editable.PathElement.Named;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.PathNode.Indexed;+import io.onedev.server.web.editable.PathNode.Named;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.annotation.ExcludedProperties;@SuppressWarnings("serial")@@ -289,46 +289,20 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {}@Override- public ErrorContext getErrorContext(PathElement element) {- final int index = ((PathElement.Indexed) element).getIndex();- final String messagePrefix = "Item " + (index+1) + ": ";-- return new ErrorContext() {-- @Override- public void addError(String errorMessage) {- error(messagePrefix + errorMessage);- }-- @Override- public boolean hasErrors(boolean recursive) {- for (FeedbackMessage message: getFeedbackMessages()) {- if (message.getMessage().toString().startsWith(messagePrefix)) {- return true;- }+ public void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {+ int index = ((Indexed) propertyNode).getIndex();+ String messagePrefix = "Item " + (index+1) + ": ";+ PathNode.Named named = (Named) pathInProperty.takeNode();+ if (named != null) {+ for (PropertyEditor<Serializable> propertyEditor: getPropertyEditorsAtRow(index)) {+ if (propertyEditor.getDescriptor().getPropertyName().equals(named.getName())) {+ error(pathInProperty, errorMessage);+ break;}-- if (recursive) {- for (PropertyEditor<Serializable> propertyEditor: getPropertyEditorsAtRow(index)) {- if (propertyEditor.hasErrors(true))- return true;- }- }- return false;}-- @Override- public ErrorContext getErrorContext(PathElement element) {- PathElement.Named namedElement = (Named) element;-- for (PropertyEditor<Serializable> propertyEditor: getPropertyEditorsAtRow(index)) {- if (propertyEditor.getDescriptor().getPropertyName().equals(namedElement.getName()))- return propertyEditor;- }- return null;- }-- };+ } else {+ error(messagePrefix + errorMessage);+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.javaindex 5176116a6f..df7d9bbd45 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java@@ -7,8 +7,6 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-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;@@ -38,11 +36,6 @@ public class BooleanPropertyEditor extends PropertyEditor<Boolean> {input.setLabel(Model.of(getDescriptor().getDisplayName(this)));}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected Boolean convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.javaindex a1b3623767..8c510427fb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java@@ -9,8 +9,6 @@ import org.apache.wicket.util.convert.ConversionException;import com.google.common.collect.Lists;-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;@@ -53,11 +51,6 @@ public class NullableBooleanPropertyEditor extends PropertyEditor<Boolean> {});}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected Boolean convertInputToValue() throws ConversionException {String stringValue = input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.javaindex b94a704f3a..1923020bf9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java@@ -14,8 +14,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.model.Project;import io.onedev.server.web.component.branch.choice.BranchChoiceProvider;import io.onedev.server.web.component.branch.choice.BranchMultiChoice;-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;@@ -74,11 +72,6 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected List<String> convertInputToValue() throws ConversionException {List<String> projectAndBranches = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.javaindex bbd744d2c9..4926c3689c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java@@ -10,8 +10,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.model.Project;import io.onedev.server.web.component.branch.choice.BranchChoiceProvider;import io.onedev.server.web.component.branch.choice.BranchSingleChoice;-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;@@ -66,11 +64,6 @@ public class BranchSingleChoiceEditor extends PropertyEditor<String> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {return input.getConvertedInput();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 56757c6008..641c71762a 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@@ -16,11 +16,9 @@ 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.util.ComponentContext;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.editable.annotation.BuildChoice;@@ -38,18 +36,18 @@ public class BuildChoiceEditor extends PropertyEditor<Long> {@Nullableprivate Project getProject() {- OneContext.push(new OneContext(this));+ ComponentContext.push(new ComponentContext(this));try {BuildChoice choice = Preconditions.checkNotNull(descriptor.getPropertyGetter().getAnnotation(BuildChoice.class));- if (choice.value().length() != 0) {+ if (choice.project().length() != 0) {return (Project) ReflectionUtils.invokeStaticMethod(- descriptor.getBeanClass(), choice.value());+ descriptor.getBeanClass(), choice.project());} else {return findParent(ProjectAware.class).getProject();}} finally {- OneContext.pop();+ ComponentContext.pop();}}@@ -105,11 +103,6 @@ public class BuildChoiceEditor extends PropertyEditor<Long> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected Long convertInputToValue() throws ConversionException {Build build = input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.javaindex 462d57a134..125f7f2f51 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.java@@ -10,8 +10,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.model.Project;import io.onedev.server.web.behavior.BuildQueryBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-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;@@ -56,11 +54,6 @@ public class BuildQueryEditor extends PropertyEditor<String> {});}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.htmlindex f1c90cbe9e..3817227265 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.html@@ -1,3 +1,3 @@<wicket:panel>- <input wicket:id="input" type="hidden"></input>+ <input wicket:id="input" type="hidden"></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex 46094585fb..5a3189cbe0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -16,11 +16,9 @@ import org.apache.wicket.util.convert.ConversionException;import com.google.common.base.Preconditions;import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.util.OneContext;+import io.onedev.server.util.ComponentContext;import io.onedev.server.web.component.select2.Select2MultiChoice;import io.onedev.server.web.component.stringchoice.StringMultiChoice;-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;@@ -44,9 +42,9 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {protected Map<String, String> load() {Map<String, String> choices;- OneContext oneContext = new OneContext(MultiChoiceEditor.this);+ ComponentContext componentContext = new ComponentContext(MultiChoiceEditor.this);- OneContext.push(oneContext);+ ComponentContext.push(componentContext);try {io.onedev.server.web.editable.annotation.ChoiceProvider choiceProvider =descriptor.getPropertyGetter().getAnnotation(@@ -61,7 +59,7 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {choices = (Map<String, String>)result;}} finally {- OneContext.pop();+ ComponentContext.pop();}return choices;@@ -107,11 +105,6 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected List<String> convertInputToValue() throws ConversionException {Collection<String> convertedInput = input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.htmlindex a62a3bcf51..6bbd331b1a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.html@@ -1,3 +1,3 @@<wicket:panel>- <input wicket:id="input" type="hidden" class="form-control"></input>+ <input wicket:id="input" type="hidden" class="form-control"></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javaindex 7fcd05f5ff..941070ae4e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -15,10 +15,8 @@ import org.apache.wicket.util.convert.ConversionException;import com.google.common.base.Preconditions;import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.util.OneContext;+import io.onedev.server.util.ComponentContext;import io.onedev.server.web.component.stringchoice.StringSingleChoice;-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;@@ -42,9 +40,9 @@ public class SingleChoiceEditor extends PropertyEditor<String> {protected Map<String, String> load() {Map<String, String> choices;- OneContext oneContext = new OneContext(SingleChoiceEditor.this);+ ComponentContext componentContext = new ComponentContext(SingleChoiceEditor.this);- OneContext.push(oneContext);+ ComponentContext.push(componentContext);try {io.onedev.server.web.editable.annotation.ChoiceProvider choiceProvider =descriptor.getPropertyGetter().getAnnotation(@@ -59,7 +57,7 @@ public class SingleChoiceEditor extends PropertyEditor<String> {choices = ((Map<String, String>)result);}} finally {- OneContext.pop();+ ComponentContext.pop();}return choices;}@@ -102,11 +100,6 @@ public class SingleChoiceEditor extends PropertyEditor<String> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.javasimilarity index 72%rename from server-core/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.javaindex cdeea9baa4..45bb181208 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.script;+package io.onedev.server.web.editable.code;import java.util.List;@@ -13,15 +13,15 @@ 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;-import io.onedev.server.web.editable.annotation.Script;+import io.onedev.server.web.editable.annotation.Code;@SuppressWarnings("serial")-public class ScriptEditSupport implements EditSupport {+public class CodeEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {Class<?> propertyClass = descriptor.getPropertyGetter().getReturnType();- Script annotation = descriptor.getPropertyGetter().getAnnotation(Script.class);+ Code annotation = descriptor.getPropertyGetter().getAnnotation(Code.class);if (annotation != null) {if (List.class.isAssignableFrom(propertyClass) && ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType()) == String.class) {return new PropertyContext<List<String>>(descriptor) {@@ -32,9 +32,9 @@ public class ScriptEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- List<String> script = model.getObject();- if (script != null && !script.isEmpty()) {- return new ScriptPropertyViewer(id, model.getObject(), annotation.value());+ List<String> code = model.getObject();+ if (code != null && !code.isEmpty()) {+ return new CodePropertyViewer(id, model.getObject(), annotation.language());} else {return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}@@ -45,12 +45,12 @@ public class ScriptEditSupport implements EditSupport {@Overridepublic PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {- return new ScriptPropertyEditor(componentId, descriptor, model, annotation.value());+ return new CodePropertyEditor(componentId, descriptor, model);}};} else {- throw new OneException("@Script annotation should only be applied to a string list property");+ throw new OneException("@Code annotation should only be applied to a List<String> property");}} else {return null;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.htmlnew file mode 100644index 0000000000..76157e7260--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.html@@ -0,0 +1,5 @@+<wicket:panel>+ <div wicket:id="container" class="code-support">+ <textarea wicket:id="input"></textarea>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.javanew file mode 100644index 0000000000..255028e05e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java@@ -0,0 +1,106 @@+package io.onedev.server.web.editable.code;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnLoadHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.form.TextArea;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;+import com.google.common.base.CharMatcher;+import com.google.common.base.Preconditions;+import com.google.common.base.Splitter;++import io.onedev.commons.utils.ReflectionUtils;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.util.ComponentContext;+import io.onedev.server.util.interpolative.Interpolative;+import io.onedev.server.web.behavior.OnTypingDoneBehavior;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.annotation.Code;++@SuppressWarnings("serial")+public class CodePropertyEditor extends PropertyEditor<List<String>> {++ private TextArea<String> input;++ public CodePropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ WebMarkupContainer container = new WebMarkupContainer("container");+ add(container);++ container.add(input = new TextArea<String>("input", Model.of(StringUtils.join(getModelObject(), "\n"))));+ input.setLabel(Model.of(getDescriptor().getDisplayName(this)));+ input.setOutputMarkupId(true);++ input.add(new OnTypingDoneBehavior() {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+ }++ @Override+ protected List<String> convertInputToValue() throws ConversionException {+ List<String> convertedInput = new ArrayList<>();+ if (input.getConvertedInput() != null)+ convertedInput.addAll(Splitter.on("\n").trimResults(CharMatcher.is('\r')).splitToList(input.getConvertedInput()));+ return convertedInput;+ }++ @SuppressWarnings("unchecked")+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new CodeSupportResourceReference()));++ Code code = Preconditions.checkNotNull(descriptor.getPropertyGetter().getAnnotation(Code.class));++ String variableProvider = code.variableProvider();+ ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);+ ArrayNode variablesNode = mapper.createArrayNode();+ if (variableProvider.length() != 0) {+ ComponentContext.push(new ComponentContext(this));+ try {+ for (String each: (List<String>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), variableProvider)) {+ ObjectNode variableNode = mapper.createObjectNode();+ variableNode.put("text", Interpolative.MARK + each + Interpolative.MARK);+ variablesNode.add(variableNode);+ }+ } finally {+ ComponentContext.pop();+ }+ }++ try {+ String script = String.format("onedev.server.codeSupport.onEditorDomReady('%s', '%s', %s, '%s');",+ input.getMarkupId(), code.language(), mapper.writeValueAsString(variablesNode), Interpolative.MARK);+ response.render(OnLoadHeaderItem.forScript(script));+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.htmlsimilarity index 59%rename from server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.htmlindex 2496116c6c..6182108253 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="script-support">+ <div class="code-support"><textarea wicket:id="input"></textarea></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.javasimilarity index 55%rename from server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.javarename to server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.javaindex b5d3a0b5d5..b226fbdf85 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.script;+package io.onedev.server.web.editable.code;import java.util.List;@@ -12,26 +12,26 @@ import org.apache.wicket.model.Model;import io.onedev.commons.utils.StringUtils;@SuppressWarnings("serial")-public class ScriptPropertyViewer extends Panel {+public class CodePropertyViewer extends Panel {- private final List<String> script;+ private final List<String> code;- private final String modeName;+ private final String language;private TextArea<String> input;- public ScriptPropertyViewer(String id, List<String> script, String modeName) {+ public CodePropertyViewer(String id, List<String> code, String language) {super(id);- this.modeName = modeName;- this.script = script;+ this.language = language;+ this.code = code;}@Overrideprotected void onInitialize() {super.onInitialize();- input = new TextArea<>("input", Model.of(StringUtils.join(script, "\n")));+ input = new TextArea<>("input", Model.of(StringUtils.join(code, "\n")));add(input);input.setOutputMarkupId(true);@@ -40,10 +40,10 @@ public class ScriptPropertyViewer extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new ScriptSupportResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new CodeSupportResourceReference()));- String script = String.format("onedev.server.scriptSupport.onViewerDomReady('%s', '%s');",- input.getMarkupId(), modeName);+ String script = String.format("onedev.server.codeSupport.onViewerDomReady('%s', '%s');",+ input.getMarkupId(), language);response.render(OnLoadHeaderItem.forScript(script));}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptSupportResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodeSupportResourceReference.javasimilarity index 69%rename from server-core/src/main/java/io/onedev/server/web/editable/script/ScriptSupportResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/editable/code/CodeSupportResourceReference.javaindex 119184a447..e6ee505a30 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptSupportResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodeSupportResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.script;+package io.onedev.server.web.editable.code;import java.util.List;@@ -10,19 +10,19 @@ import io.onedev.server.web.asset.codemirror.CodeMirrorResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;-public class ScriptSupportResourceReference extends BaseDependentResourceReference {+public class CodeSupportResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public ScriptSupportResourceReference() {- super(ScriptSupportResourceReference.class, "script-support.js");+ public CodeSupportResourceReference() {+ super(CodeSupportResourceReference.class, "code-support.js");}@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(ScriptSupportResourceReference.class, "script-support.css")));+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(CodeSupportResourceReference.class, "code-support.css")));return dependencies;}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/script-support.css b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.csssimilarity index 50%rename from server-core/src/main/java/io/onedev/server/web/editable/script/script-support.cssrename to server-core/src/main/java/io/onedev/server/web/editable/code/code-support.cssindex 8091243bda..f6654c3cd8 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/script/script-support.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.css@@ -1,17 +1,24 @@-.script-support {+.code-support {border: 1px solid #E0E0E0;border-radius: 4px;padding: 1px;}-.has-error .script-support {+.has-error .code-support {border-color: #a94442;}-.script-support .CodeMirror {+.code-support .CodeMirror {height: auto;}-.script-support .CodeMirror-scroll {+.code-support .CodeMirror-scroll {min-height: 120px;}.property-viewer .CodeMirror .CodeMirror-cursor {border-left: none;}+.CodeMirror-hints>.tips {+ background: #F0F0F0;+ padding: 8px;+}+.CodeMirror-hint {+ padding: 4px;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/script-support.js b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.jssimilarity index 50%rename from server-core/src/main/java/io/onedev/server/web/editable/script/script-support.jsrename to server-core/src/main/java/io/onedev/server/web/editable/code/code-support.jsindex a420c046dd..a3f84cb098 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/script/script-support.js+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js@@ -1,5 +1,5 @@-onedev.server.scriptSupport = {- onEditorDomReady: function(inputId, modeName) {+onedev.server.codeSupport = {+ onEditorDomReady: function(inputId, modeName, variables, varMark) {var cm = CodeMirror.fromTextArea(document.getElementById(inputId), {indentWithTabs: true,indentUnit: 4,@@ -21,7 +21,48 @@ onedev.server.scriptSupport = {cm.save();onedev.server.form.markDirty($input.closest("form"));});- onedev.server.scriptSupport.trackWidth(inputId);++ cm.on("keypress", function(cm, event) {+ if (String.fromCharCode(event.keyCode) == varMark) {+ var cursor = cm.getCursor();+ var line = cursor.line;+ var start = cursor.ch;++ if (start < 1 || cm.doc.getLine(line).substr(start-1, 1) != "\\") {+ CodeMirror.showHint(cm, function () {+ var end = cm.getCursor().ch;+ var matchWith = cm.doc.getLine(line).substr(start, end);+ var matched = variables.filter(function (item) {+ return item.text.indexOf(matchWith) >= 0;+ });+ for (var i = 0; i < matched.length; i++) {+ if (i == matched.length-1) {+ matched[i].render = function(element, self, data) {+ var $element = $(element);+ $element.append(data.text);+ $element.parent().append(+ "<li class='tips'>" ++ "<div>Type '" + varMark + "' to start inserting variable</div>" ++ "<div>Type '\\" + varMark + "' to input normal '" + varMark + "' character</div>" ++ "</li>");+ };+ } else {+ matched[i].render = function(element, self, data) {+ $(element).append(data.text);+ };+ }+ }+ return {+ list: matched,+ from: CodeMirror.Pos(line, start),+ to: CodeMirror.Pos(line, end)+ };+ }, {completeSingle: false});+ }+ }+ });++ onedev.server.codeSupport.trackWidth(inputId);},onViewerDomReady: function(inputId, modeName) {var cm = CodeMirror.fromTextArea(document.getElementById(inputId), {@@ -42,7 +83,7 @@ onedev.server.scriptSupport = {onedev.server.codemirror.setModeByName(cm, modeName);- onedev.server.scriptSupport.trackWidth(inputId);+ onedev.server.codeSupport.trackWidth(inputId);},trackWidth: function(inputId) {var $cm = $("#" + inputId).next();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/codecommentquery/CodeCommentQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/codecommentquery/CodeCommentQueryEditor.javaindex 9683a31166..8e7c5ed5e9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/codecommentquery/CodeCommentQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/codecommentquery/CodeCommentQueryEditor.java@@ -10,8 +10,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.model.Project;import io.onedev.server.web.behavior.CodeCommentQueryBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-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;@@ -52,11 +50,6 @@ public class CodeCommentQueryEditor extends PropertyEditor<String> {});}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.javaindex 4ef434c081..142d3b3ade 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java@@ -9,8 +9,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.colorpicker.ColorPicker;-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;@@ -41,11 +39,6 @@ public class ColorPropertyEditor extends PropertyEditor<String> {});}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.javaindex 1297c46ab4..4a1ec76b65 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.java@@ -10,8 +10,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.model.Project;import io.onedev.server.web.behavior.CommitQueryBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-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;@@ -52,11 +50,6 @@ public class CommitQueryEditor extends PropertyEditor<String> {});}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.javaindex a492227cc7..cc453d5ec9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java@@ -14,8 +14,6 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.DateTextFieldimport de.agilecoders.wicket.extensions.markup.html.bootstrap.form.DateTextFieldConfig;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.EditableUtils;-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.annotation.OmitName;@@ -56,11 +54,6 @@ public class DatePropertyEditor extends PropertyEditor<Date> {});}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected Date convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.cssindex 0e35aabe0c..acbc5b1a98 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css@@ -97,11 +97,10 @@.property-viewer>.polymorphic-list>tbody>tr>td>.type-selector {margin-bottom: 12px;}-.property-viewer>.def-list>div>table>tfoot>tr>td.norecords-td>div,.property-viewer>.bean-list>tfoot>tr>td.no-elements>div {border-top: 2px solid #DDD;margin-top: -6px;- padding-top: 8px;+ padding-top: 6px;}.editable>.polymorphic>.type-selector {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.javaindex 8f94d5f800..13dc1754cc 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java@@ -14,8 +14,6 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.component.stringchoice.StringSingleChoice;-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;@@ -83,11 +81,6 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected Enum<?> convertInputToValue() throws ConversionException {String convertedInput = input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.javaindex dd8095444c..30f978bad0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java@@ -18,8 +18,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.web.component.select2.Select2MultiChoice;import io.onedev.server.web.component.stringchoice.StringMultiChoice;-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;@@ -84,11 +82,6 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected List<Enum<?>> convertInputToValue() throws ConversionException {List<Enum<?>> values = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex b11a4b685d..53bf5ee2a3 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -21,8 +21,6 @@ import io.onedev.server.model.Group;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;import io.onedev.server.web.component.groupchoice.GroupMultiChoice;-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.annotation.GroupChoice;@@ -88,11 +86,6 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected List<String> convertInputToValue() throws ConversionException {List<String> groupNames = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex 5958d53aea..79718d9a26 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -19,8 +19,6 @@ import io.onedev.server.model.Group;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;import io.onedev.server.web.component.groupchoice.GroupSingleChoice;-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.annotation.GroupChoice;@@ -89,11 +87,6 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {GroupFacade group = input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.javaindex 7a6ac0d061..200d31d8e3 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java@@ -13,8 +13,6 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.web.component.issue.choice.IssueChoiceProvider;import io.onedev.server.web.component.issue.choice.IssueSingleChoice;-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;@@ -77,11 +75,6 @@ public class IssueChoiceEditor extends PropertyEditor<Long> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected Long convertInputToValue() throws ConversionException {Issue issue = input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.javaindex 05c9599ff3..3c7d6b3561 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java@@ -10,8 +10,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.model.Project;import io.onedev.server.web.behavior.IssueQueryBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-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;@@ -55,11 +53,6 @@ public class IssueQueryEditor extends PropertyEditor<String> {});}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.javaindex 1164339a19..14e15916e3 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.java@@ -9,8 +9,6 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.component.job.JobMultiChoice;-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;@@ -41,11 +39,6 @@ public class JobMultiChoiceEditor extends PropertyEditor<List<String>> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected List<String> convertInputToValue() throws ConversionException {Collection<String> convertedInput = input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.javaindex e0279562f1..904af5ad3a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.java@@ -5,8 +5,6 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.component.job.JobSingleChoice;-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;@@ -31,11 +29,6 @@ public class JobSingleChoiceEditor extends PropertyEditor<String> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.javaindex 96f0055936..de4c009d49 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.java@@ -17,7 +17,8 @@ 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;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;@SuppressWarnings("serial")abstract class JobDependencyEditPanel extends Panel implements CISpecAware, JobAware {@@ -81,15 +82,15 @@ abstract class JobDependencyEditPanel extends Panel implements CISpecAware, JobAif (dependencyIndex != -1) {JobDependency oldDependency = dependencies.get(dependencyIndex);if (!dependency.getJobName().equals(oldDependency.getJobName()) && getDependency(dependency.getJobName()) != null) {- editor.getErrorContext(new PathElement.Named("jobName"))- .addError("Dependency to this job is already defined");+ editor.error(new Path(new PathNode.Named("jobName")),+ "Dependency to this job is already defined");}} else if (getDependency(dependency.getJobName()) != null) {- editor.getErrorContext(new PathElement.Named("jobName"))- .addError("Dependency to this job is already defined");+ editor.error(new Path(new PathNode.Named("jobName")),+ "Dependency to this job is already defined");}- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {if (dependencyIndex != -1) {dependencies.set(dependencyIndex, dependency);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.javaindex 5bdcbac1e2..a3fd4d644e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java@@ -35,8 +35,6 @@ 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;@@ -270,9 +268,4 @@ class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {response.render(CssHeaderItem.forReference(new JobDependencyCssResourceReference()));}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.javaindex 150b4ac54e..966eefa02c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java@@ -38,12 +38,10 @@ import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.param.ScriptingValues;import io.onedev.server.ci.job.param.SpecifiedValues;import io.onedev.server.ci.job.param.ValuesProvider;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.ci.job.paramspec.SecretParam;+import io.onedev.server.util.ComponentContext;import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -59,7 +57,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {private final String paramSpecProviderMethodName;- private transient Map<String, InputSpec> paramSpecs;+ private transient Map<String, ParamSpec> paramSpecs;private transient Serializable defaultParamBean;@@ -77,17 +75,17 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {}@SuppressWarnings("unchecked")- private Map<String, InputSpec> getParamSpecs() {+ private Map<String, ParamSpec> getParamSpecs() {if (paramSpecs == null) {- OneContext.push(new OneContext(this));+ ComponentContext.push(new ComponentContext(this));paramSpecs = new LinkedHashMap<>();try {- for (InputSpec paramSpec: (List<InputSpec>) ReflectionUtils.invokeStaticMethod(+ for (ParamSpec paramSpec: (List<ParamSpec>) ReflectionUtils.invokeStaticMethod(getDescriptor().getBeanClass(), paramSpecProviderMethodName)) {paramSpecs.put(paramSpec.getName(), paramSpec);}} finally {- OneContext.pop();+ ComponentContext.pop();}}return paramSpecs;@@ -214,8 +212,10 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {try {JobParam.validateParamValues(specifiedValues.getValues());} catch (ValidationException e) {- RepeatingView paramsView = (RepeatingView) get("params");- paramsView.get(index).get("values").error(e.getMessage());+ if (!getFlag(FLAG_RENDERING)) {+ RepeatingView paramsView = (RepeatingView) get("params");+ paramsView.get(index).get("values").error(e.getMessage());+ }}}index++;@@ -230,7 +230,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {private SpecifiedValues newSpecifiedValueProvider(PropertyDescriptor property) {SpecifiedValues specifiedValues = new SpecifiedValues();Object typedValue = property.getPropertyValue(getDefaultParamBean());- InputSpec paramSpec = getParamSpecs().get(property.getDisplayName());+ ParamSpec paramSpec = getParamSpecs().get(property.getDisplayName());Preconditions.checkNotNull(paramSpec);List<String> strings = paramSpec.convertToStrings(typedValue);List<List<String>> values = new ArrayList<>();@@ -241,13 +241,15 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {private Component newSpecifiedValueEditor(String componentId, PropertyDescriptor property, @Nullable List<String> value) {WebMarkupContainer item = new WebMarkupContainer(componentId);- InputSpec paramSpec = Preconditions.checkNotNull(getParamSpecs().get(property.getDisplayName()));+ ParamSpec paramSpec = Preconditions.checkNotNull(getParamSpecs().get(property.getDisplayName()));+Serializable paramBean;try {paramBean = getDefaultParamBean().getClass().newInstance();} catch (InstantiationException | IllegalAccessException e) {throw new RuntimeException(e);}+try {if (value != null)property.setPropertyValue(paramBean, paramSpec.convertToObject(value));@@ -263,7 +265,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {bean.setSecret((String) property.getPropertyValue(paramBean));item.add(PropertyContext.edit("value", bean, "secret"));item.add(new Label("description", "Secrets can be defined in project setting"));- }+ }item.add(new AjaxLink<Void>("delete") {@@ -326,15 +328,10 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {fragment.setOutputMarkupId(true);return fragment;} else {- return PropertyContext.edit("values", valuesProvider, "script").setOutputMarkupId(true);+ return PropertyContext.edit("values", valuesProvider, "scriptName").setOutputMarkupId(true);}}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@SuppressWarnings("unchecked")@Overrideprotected List<Serializable> convertInputToValue() throws ConversionException {@@ -343,17 +340,17 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {Label label = (Label) paramItem.get("name");JobParam param = new JobParam();param.setName((String) label.getDefaultModelObject());- InputSpec paramSpec = Preconditions.checkNotNull(getParamSpecs().get(param.getName()));- param.setSecret(paramSpec instanceof SecretInput);+ ParamSpec paramSpec = Preconditions.checkNotNull(getParamSpecs().get(param.getName()));+ param.setSecret(paramSpec instanceof SecretParam);Component valuesEditor = paramItem.get("values");if (valuesEditor instanceof PropertyEditor) {ScriptingValues scriptingValues = new ScriptingValues();- scriptingValues.setScript((List<String>) ((PropertyEditor<Serializable>) valuesEditor).getConvertedInput());+ scriptingValues.setScriptName((String) ((PropertyEditor<Serializable>) valuesEditor).getConvertedInput());param.setValuesProvider(scriptingValues);} else {SpecifiedValues specifiedValues = new SpecifiedValues();for (Component valueItem: (WebMarkupContainer)valuesEditor.get("values")) {- Object propertyValue = ((PropertyEditor<Serializable>) valueItem.get("value")).getConvertedInput();+ Object propertyValue = ((PropertyEditor<Serializable>) valueItem.get("value")).getConvertedInput();specifiedValues.getValues().add(paramSpec.convertToStrings(propertyValue));}param.setValuesProvider(specifiedValues);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.javaindex 8e1c4e1212..ded8e9275b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java@@ -63,7 +63,7 @@ class ParamListViewPanel extends Panel {paramItem.add(new Label("valuesProvider", ScriptingValues.SECRET_DISPLAY_NAME));elseparamItem.add(new Label("valuesProvider", ScriptingValues.DISPLAY_NAME));- paramItem.add(PropertyContext.view("values", param.getValuesProvider(), "script"));+ paramItem.add(PropertyContext.view("values", param.getValuesProvider(), "scriptName"));}paramsView.add(paramItem);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/SecretEditBean.java b/server-core/src/main/java/io/onedev/server/web/editable/job/param/SecretEditBean.javaindex 52bfd83a06..960ce923d0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/param/SecretEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/param/SecretEditBean.java@@ -1,14 +1,16 @@package io.onedev.server.web.editable.job.param;import java.io.Serializable;+import java.util.ArrayList;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.model.support.Secret;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.util.WicketUtils;@Editablepublic class SecretEditBean implements Serializable {@@ -30,7 +32,13 @@ public class SecretEditBean implements Serializable {@SuppressWarnings("unused")private static List<String> getSecretChoices() {- return OneContext.get().getProject().getSecrets().stream().map(it->it.getName()).collect(Collectors.toList());+ List<String> secretNames = new ArrayList<>();+ ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();+ for (Secret secret: page.getProject().getSecrets()) {+ if (!secretNames.contains(secret.getName()) && secret.isAuthorized(page.getProject(), page.getCommit()))+ secretNames.add(secret.getName());+ }+ return secretNames;}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/param-list.css b/server-core/src/main/java/io/onedev/server/web/editable/job/param/param-list.cssindex ebe8e63150..08ab96f5a3 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/param/param-list.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/param/param-list.css@@ -20,6 +20,10 @@.job-params-edit>.job-param .specified-value>a>i {font-size: 20px;}+.job-params-edit>.job-param .specified-value.has-error {+ background: #FEDADA;+ color: #DD4B4B;+}.job-params-edit>.job-param>.values>.help {color: #444;font-size: 18px;@@ -52,3 +56,4 @@.job-params-view .specified-values {padding-left: 30px;}+diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.javaindex e51498c457..046c509085 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.java@@ -4,25 +4,24 @@ import java.io.Serializable;import javax.validation.constraints.NotNull;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.ExcludedProperties;@Editablepublic class ParamSpecBean implements Serializable {private static final long serialVersionUID = 1L;- private InputSpec paramSpec;+ private ParamSpec paramSpec;+ // change Named("paramSpec") also if change name of this property@Editable(name="Type", order=100)@NotNull(message="may not be empty")- @ExcludedProperties({"canBeChangedBy", "nameOfEmptyValue"})- public InputSpec getParamSpec() {+ public ParamSpec getParamSpec() {return paramSpec;}- public void setParamSpec(InputSpec paramSpec) {+ public void setParamSpec(ParamSpec paramSpec) {this.paramSpec = paramSpec;}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 7e0b6c9657..0d8660201d 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@@ -3,9 +3,6 @@ package io.onedev.server.web.editable.job.paramspec;import java.util.ArrayList;import java.util.List;-import javax.lang.model.SourceVersion;-import javax.validation.ValidationException;-import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -14,22 +11,22 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.server.util.BuildConstants;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.Path;+import io.onedev.server.web.editable.PathNode;@SuppressWarnings("serial")abstract class ParamSpecEditPanel extends Panel implements InputContext {- private final List<InputSpec> paramSpecs;+ private final List<ParamSpec> paramSpecs;private final int paramSpecIndex;- public ParamSpecEditPanel(String id, List<InputSpec> paramSpecs, int paramSpecIndex) {+ public ParamSpecEditPanel(String id, List<ParamSpec> paramSpecs, int paramSpecIndex) {super(id);this.paramSpecs = paramSpecs;@@ -77,21 +74,19 @@ abstract class ParamSpecEditPanel extends Panel implements InputContext {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- InputSpec param = bean.getParamSpec();+ ParamSpec param = bean.getParamSpec();if (paramSpecIndex != -1) {- InputSpec oldParam = paramSpecs.get(paramSpecIndex);+ ParamSpec oldParam = paramSpecs.get(paramSpecIndex);if (!param.getName().equals(oldParam.getName()) && getInputSpec(param.getName()) != null) {- editor.getErrorContext(new PathElement.Named("paramSpec"))- .getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another parameter");+ editor.error(new Path(new PathNode.Named("paramSpec"), new PathNode.Named("name")),+ "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"))- .addError("This name has already been used by another parameter");+ editor.error(new Path(new PathNode.Named("paramSpec"), new PathNode.Named("name")),+ "This name has already been used by another parameter");}- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {if (paramSpecIndex != -1) {paramSpecs.set(paramSpecIndex, param);} else {@@ -130,33 +125,23 @@ abstract class ParamSpecEditPanel extends Panel implements InputContext {@Overridepublic List<String> getInputNames() {- List<String> inputNames = new ArrayList<>();+ List<String> paramNames = new ArrayList<>();int currentIndex = 0;- for (InputSpec param: paramSpecs) {+ for (ParamSpec param: paramSpecs) {if (currentIndex != paramSpecIndex)- inputNames.add(param.getName());+ paramNames.add(param.getName());currentIndex++;}- return inputNames;+ return paramNames;}@Override- public InputSpec getInputSpec(String paramName) {- for (InputSpec param: paramSpecs) {+ public ParamSpec getInputSpec(String paramName) {+ for (ParamSpec param: paramSpecs) {if (paramName.equals(param.getName()))return param;}return null;}-- @Override- public void validateName(String inputName) {- if (!SourceVersion.isIdentifier(inputName) || inputName.contains("$")) {- throw new ValidationException("param name should start with letter and can only consist of "- + "alphanumeric and underscore characters");- } else if (BuildConstants.ALL_FIELDS.contains(inputName)) {- throw new ValidationException("'" + inputName + "' is reserved");- }- }-+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.properties b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.propertiesdeleted file mode 100644index ad7bbc903b..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.properties+++ /dev/null@@ -1,6 +0,0 @@-resource.input.input=When parameter-resource.input.description=Optionally describes the parameter-resource.input.showCondition=Enable if visibility of this parameter depends on other parameters-resource.input.allowEmpty=Whether or not this parameter accepts empty value-resource.input.allowMultiple=Whether or not multiple values can be specified for this parameter-resource.input.canBeChangedBy=This setting tells who can change this parameter\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.javaindex 004bec0547..cb3b29e469 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java@@ -26,15 +26,12 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.ci.job.paramspec.ParamSpec;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.EditableUtils;-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;@@ -42,14 +39,14 @@ import io.onedev.server.web.editable.PropertyUpdating;@SuppressWarnings("serial")class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {- private final List<InputSpec> params;+ private final List<ParamSpec> params;public ParamSpecListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {super(id, propertyDescriptor, model);params = new ArrayList<>();for (Serializable each: model.getObject()) {- params.add((InputSpec) each);+ params.add((ParamSpec) each);}}@@ -80,12 +77,12 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {});- List<IColumn<InputSpec, Void>> columns = new ArrayList<>();+ List<IColumn<ParamSpec, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("")) {+ columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {cellItem.add(new Label(componentId, "<span class=\"drag-indicator fa fa-reorder\"></span>").setEscapeModelStrings(false));}@@ -96,35 +93,39 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {});- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Name")) {+ columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("Name")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {cellItem.add(new Label(componentId, rowModel.getObject().getName()));}});- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Type")) {+ columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("Type")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {cellItem.add(new Label(componentId, EditableUtils.getDisplayName(rowModel.getObject().getClass())));}});- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Allow Empty")) {+ columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("Description")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- cellItem.add(new Label(componentId, StringUtils.describe(rowModel.getObject().isAllowEmpty())));+ public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {+ String description = rowModel.getObject().getDescription();+ if (description != null)+ cellItem.add(new Label(componentId, description));+ else+ cellItem.add(new Label(componentId, "<i>No description</i>").setEscapeModelStrings(false));}});- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("")) {+ columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {Fragment fragment = new Fragment(componentId, "actionColumnFrag", ParamSpecListEditPanel.this);fragment.add(new ModalLink("edit") {@@ -170,17 +171,17 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {});- IDataProvider<InputSpec> dataProvider = new ListDataProvider<InputSpec>() {+ IDataProvider<ParamSpec> dataProvider = new ListDataProvider<ParamSpec>() {@Override- protected List<InputSpec> getData() {+ protected List<ParamSpec> getData() {return params;}};- DataTable<InputSpec, Void> dataTable;- add(dataTable = new DataTable<InputSpec, Void>("paramSpecs", columns, dataProvider, Integer.MAX_VALUE));+ DataTable<ParamSpec, Void> dataTable;+ add(dataTable = new DataTable<ParamSpec, Void>("paramSpecs", columns, dataProvider, Integer.MAX_VALUE));dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));@@ -217,16 +218,11 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected List<Serializable> convertInputToValue() throws ConversionException {List<Serializable> value = new ArrayList<>();- for (InputSpec each: params)+ for (ParamSpec each: params)value.add(each);return value;}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.javaindex 11e4debfaf..cd8ae3957c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.java@@ -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.util.inputspec.InputSpec;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;@@ -22,7 +22,7 @@ public class ParamSpecListEditSupport implements EditSupport {public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());- if (elementClass == InputSpec.class) {+ if (elementClass == ParamSpec.class) {return new PropertyContext<List<Serializable>>(descriptor) {@Overridediff --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 09ee93d016..ab88bcc892 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@@ -28,8 +28,7 @@ import org.apache.wicket.model.Model;import com.google.common.collect.Sets;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;@@ -37,25 +36,25 @@ import io.onedev.server.web.page.layout.SideFloating;@SuppressWarnings("serial")class ParamSpecListViewPanel extends Panel {- private final List<InputSpec> paramSpecs = new ArrayList<>();+ private final List<ParamSpec> paramSpecs = new ArrayList<>();public ParamSpecListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {super(id);for (Serializable each: elements)- paramSpecs.add((InputSpec) each);+ paramSpecs.add((ParamSpec) each);}@Overrideprotected void onInitialize() {super.onInitialize();- List<IColumn<InputSpec, Void>> columns = new ArrayList<>();+ List<IColumn<ParamSpec, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Name")) {+ columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("Name")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {@Override@@ -67,11 +66,11 @@ class ParamSpecListViewPanel extends Panel {}});- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Type")) {+ columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("Type")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- InputSpec param = rowModel.getObject();+ public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {+ ParamSpec param = rowModel.getObject();cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {@Override@@ -83,25 +82,29 @@ class ParamSpecListViewPanel extends Panel {}});- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Allow Empty")) {+ columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("Description")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {@Overrideprotected Component newLabel(String componentId) {- return new Label(componentId, StringUtils.describe(rowModel.getObject().isAllowEmpty()));+ String description = rowModel.getObject().getDescription();+ if (description != null)+ return new Label(componentId, description);+ else+ return new Label(componentId, "<i>No description</i>").setEscapeModelStrings(false);}});}});- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("")) {+ columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {+ public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {@Override@@ -120,16 +123,16 @@ class ParamSpecListViewPanel extends Panel {});- IDataProvider<InputSpec> dataProvider = new ListDataProvider<InputSpec>() {+ IDataProvider<ParamSpec> dataProvider = new ListDataProvider<ParamSpec>() {@Override- protected List<InputSpec> getData() {+ protected List<ParamSpec> getData() {return paramSpecs;}};- add(new DataTable<InputSpec, Void>("paramSpecs", columns, dataProvider, Integer.MAX_VALUE) {+ add(new DataTable<ParamSpec, Void>("paramSpecs", columns, dataProvider, Integer.MAX_VALUE) {@Overrideprotected void onInitialize() {@@ -169,7 +172,7 @@ class ParamSpecListViewPanel extends Panel {@Overrideprotected String getTitle() {- InputSpec param = paramSpecs.get(index);+ ParamSpec param = paramSpecs.get(index);return "Parameter Spec (type: " + EditableUtils.getDisplayName(param.getClass()) + ")";}diff --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.javaindex b4cb72be11..da6cc84c7c 100644--- 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.java@@ -15,7 +15,8 @@ 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;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;@SuppressWarnings("serial")abstract class ProjectDependencyEditPanel extends Panel {@@ -79,15 +80,15 @@ abstract class ProjectDependencyEditPanel extends Panel {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");+ editor.error(new Path(new PathNode.Named("projectName")),+ "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");+ editor.error(new Path(new PathNode.Named("projectName")),+ "Dependency to this project is already defined");}- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {if (dependencyIndex != -1) {dependencies.set(dependencyIndex, dependency);} else {diff --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.javaindex 7a8af9bc1f..e72e9577cd 100644--- 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.java@@ -31,8 +31,6 @@ 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;@@ -228,9 +226,4 @@ class ProjectDependencyListEditPanel extends PropertyEditor<List<Serializable>>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/report/ReportEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.javaindex 825c67d22c..2a9ee1778e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.java@@ -71,7 +71,7 @@ abstract class ReportEditPanel extends Panel {super.onSubmit(target, form);JobReport report = bean.getReport();- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {if (reportIndex != -1) {reports.set(reportIndex, report);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.javaindex 8618e850f8..af7144568d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java@@ -30,8 +30,6 @@ 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.EditableUtils;-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;@@ -209,9 +207,4 @@ class ReportListEditPanel extends PropertyEditor<List<Serializable>> {return value;}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.javaindex 0b8fff005f..fede3f97ac 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.java@@ -17,7 +17,8 @@ import io.onedev.server.ci.job.JobService;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;@SuppressWarnings("serial")abstract class ServiceEditPanel extends Panel implements CISpecAware, JobAware {@@ -81,15 +82,15 @@ abstract class ServiceEditPanel extends Panel implements CISpecAware, JobAware {if (serviceIndex != -1) {JobService oldService = services.get(serviceIndex);if (!service.getName().equals(oldService.getName()) && getService(service.getName()) != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("Service is already defined");+ editor.error(new Path(new PathNode.Named("name")),+ "Service is already defined");}} else if (getService(service.getName()) != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("Service is already defined");+ editor.error(new Path(new PathNode.Named("name")),+ "Service is already defined");}- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {if (serviceIndex != -1) {services.set(serviceIndex, service);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.javaindex 64b1a7878a..e2a6d8ce5d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.java@@ -35,8 +35,6 @@ 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;@@ -251,11 +249,6 @@ class ServiceListEditPanel extends PropertyEditor<List<Serializable>> {value.add(each);return value;}-- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }@Overridepublic void renderHead(IHeaderResponse response) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.javaindex dc105004db..61524a4cc1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.java@@ -72,7 +72,7 @@ abstract class TriggerEditPanel extends Panel implements JobAware {super.onSubmit(target, form);JobTrigger trigger = bean.getTrigger();- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {if (triggerIndex != -1) {triggers.set(triggerIndex, trigger);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.javaindex 9c91d3a9ba..db9805c6d0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java@@ -33,8 +33,6 @@ 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;@@ -238,9 +236,4 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {response.render(CssHeaderItem.forReference(new TriggerCssResourceReference()));}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/trigger.css b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/trigger.cssindex 440a20dc05..7ce58ee60a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/trigger.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/trigger.css@@ -1,5 +1,5 @@.floating.job-trigger td.name {- width: 120px !important;+ 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/markdown/MarkdownPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.javaindex a2c7d4b340..f6af7a96a9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java@@ -8,8 +8,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.markdown.MarkdownEditor;-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;@@ -39,11 +37,6 @@ public class MarkdownPropertyEditor extends PropertyEditor<String> {});}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.javaindex 073abec034..419ccfcbda 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java@@ -7,8 +7,6 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-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;@@ -40,11 +38,6 @@ public class NumericPropertyEditor extends PropertyEditor<Number> {});}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected Number convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.javaindex aabaa7b132..2181fb0f4f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java@@ -9,8 +9,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-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.annotation.Password;@@ -66,11 +64,6 @@ public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {});}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {if (input.getConvertedInput() != null) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.javaindex 520ddd4f5c..48fbc66882 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java@@ -9,8 +9,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-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.annotation.Password;@@ -48,11 +46,6 @@ public class PasswordPropertyEditor extends PropertyEditor<String> {});}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.javaindex 82698accdb..305ccd499b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java@@ -30,10 +30,11 @@ import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.editable.EditableUtils;-import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.ValueEditor;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.annotation.ExcludedProperties;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -86,7 +87,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {@Overrideprotected String load() {- if (hasErrors(false))+ if (hasErrorMessage())return " has-error";elsereturn "";@@ -225,8 +226,8 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {}@Override- public ErrorContext getErrorContext(PathElement element) {- return ((ErrorContext) get(BEAN_EDITOR_ID)).getErrorContext(element);+ public void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {+ ((ValueEditor<?>) get(BEAN_EDITOR_ID)).error(pathInProperty, errorMessage);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.javaindex ebd83a1729..638adb1960 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java@@ -35,10 +35,12 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.editable.EditableUtils;-import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.PathNode.Indexed;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.ValueEditor;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.annotation.ExcludedProperties;@SuppressWarnings("serial")@@ -300,8 +302,8 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa}@Override- public ErrorContext getErrorContext(PathElement element) {- int index = ((PathElement.Indexed) element).getIndex();+ public void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {+ int index = ((Indexed) propertyNode).getIndex();int currentIndex = 0;Iterator<Component> it = rows.iterator();@@ -309,8 +311,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializawhile (currentIndex++ < index) {row = it.next();}-- return (ErrorContext) row.get("elementEditor");+ ((ValueEditor<?>) row.get("elementEditor")).error(pathInProperty, errorMessage);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.javaindex 4dcb66f276..090ddf6d58 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.java@@ -13,8 +13,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.web.component.pullrequest.choice.PullRequestChoiceProvider;import io.onedev.server.web.component.pullrequest.choice.PullRequestSingleChoice;-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;@@ -77,11 +75,6 @@ public class PullRequestChoiceEditor extends PropertyEditor<Long> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected Long convertInputToValue() throws ConversionException {PullRequest request = input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.javaindex db244c7981..56760cede6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.java@@ -10,8 +10,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.model.Project;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.behavior.PullRequestQueryBehavior;-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;@@ -52,11 +50,6 @@ public class PullRequestQueryEditor extends PropertyEditor<String> {});}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.htmldeleted file mode 100644index 801c187dbc..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.html+++ /dev/null@@ -1,5 +0,0 @@-<wicket:panel>- <div wicket:id="container" class="script-support">- <textarea wicket:id="input"></textarea>- </div>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.javadeleted file mode 100644index 990c864645..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java+++ /dev/null@@ -1,82 +0,0 @@-package io.onedev.server.web.editable.script;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnLoadHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.form.TextArea;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.util.convert.ConversionException;--import com.google.common.base.CharMatcher;-import com.google.common.base.Splitter;--import io.onedev.commons.utils.StringUtils;-import io.onedev.server.web.behavior.OnTypingDoneBehavior;-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;--@SuppressWarnings("serial")-public class ScriptPropertyEditor extends PropertyEditor<List<String>> {-- private final String modeName;-- private TextArea<String> input;-- public ScriptPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel, String modeName) {- super(id, propertyDescriptor, propertyModel);- this.modeName = modeName;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- WebMarkupContainer container = new WebMarkupContainer("container");- add(container);-- container.add(input = new TextArea<String>("input", Model.of(StringUtils.join(getModelObject(), "\n"))));- input.setLabel(Model.of(getDescriptor().getDisplayName(this)));- input.setOutputMarkupId(true);-- input.add(new OnTypingDoneBehavior() {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- onPropertyUpdating(target);- }-- });- }-- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-- @Override- protected List<String> convertInputToValue() throws ConversionException {- List<String> convertedInput = new ArrayList<>();- if (input.getConvertedInput() != null)- convertedInput.addAll(Splitter.on("\n").trimResults(CharMatcher.is('\r')).splitToList(input.getConvertedInput()));- return convertedInput;- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new ScriptSupportResourceReference()));-- String script = String.format("onedev.server.scriptSupport.onEditorDomReady('%s', '%s');",- input.getMarkupId(), modeName);- response.render(OnLoadHeaderItem.forScript(script));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditSupport.javanew file mode 100644index 0000000000..1737be0691--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditSupport.java@@ -0,0 +1,62 @@+package io.onedev.server.web.editable.scriptchoice;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;++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;+import io.onedev.server.web.editable.annotation.ScriptChoice;++@SuppressWarnings("serial")+public class ScriptChoiceEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ Class<?> propertyClass = descriptor.getPropertyGetter().getReturnType();+ if (descriptor.getPropertyGetter().getAnnotation(ScriptChoice.class) != null) {+ if (propertyClass == String.class) {+ return new PropertyContext<String>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null) {+ return new Label(id, model.getObject());+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new ScriptChoiceEditor(componentId, descriptor, model);+ }++ };+ } else {+ throw new IllegalStateException("@ScriptChoice annotation should only be "+ + "applied to a String property");+ }+ } else {+ return null;+ }++ }++ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.htmlnew file mode 100644index 0000000000..6bbd331b1a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <input wicket:id="input" type="hidden" class="form-control">+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.javanew file mode 100644index 0000000000..1d07fe25cd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java@@ -0,0 +1,96 @@+package io.onedev.server.web.editable.scriptchoice;++import java.util.LinkedHashMap;+import java.util.Map;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.markup.html.form.FormComponent;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import com.google.common.base.Preconditions;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.groovyscript.GroovyScript;+import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.web.component.stringchoice.StringSingleChoice;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.annotation.ScriptChoice;++@SuppressWarnings("serial")+public class ScriptChoiceEditor extends PropertyEditor<String> {++ private FormComponent<String> input;++ public ScriptChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ IModel<Map<String, String>> choicesModel = new LoadableDetachableModel<Map<String, String>>() {++ @Override+ protected Map<String, String> load() {+ Map<String, String> choices = new LinkedHashMap<>();+ ScriptChoice scriptChoice = descriptor.getPropertyGetter().getAnnotation(ScriptChoice.class);+ Preconditions.checkNotNull(scriptChoice);++ for (GroovyScript script: OneDev.getInstance(SettingManager.class).getGroovyScripts()) {+ if (script.isAuthorized(ScriptIdentity.get()))+ choices.put(script.getName(), null);+ }+ return choices;+ }++ };++ input = new StringSingleChoice("input", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ String selection = ScriptChoiceEditor.this.getModelObject();+ if (choicesModel.getObject().containsKey(selection))+ return selection;+ else+ return null;+ }++ }, choicesModel) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().configurePlaceholder(descriptor, this);+ }++ };+ // add this to control allowClear flag of select2+ input.setRequired(descriptor.isPropertyRequired());+ input.setLabel(Model.of(getDescriptor().getDisplayName(this)));++ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });++ add(input);+ }++ @Override+ protected String convertInputToValue() throws ConversionException {+ return input.getConvertedInput();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.javaindex bb9e9ee55e..e4ad430426 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java@@ -13,7 +13,7 @@ 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.job.JobAware;-import io.onedev.server.model.support.jobexecutor.ServiceLocator;+import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.javaindex 6cb3d26e18..94dba10530 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java@@ -28,14 +28,12 @@ import io.onedev.server.ci.CISpec;import io.onedev.server.ci.CISpecAware;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobAware;-import io.onedev.server.model.support.jobexecutor.ServiceLocator;+import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;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;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@@ -276,9 +274,4 @@ class LocatorListEditPanel extends PropertyEditor<List<Serializable>> {return value;}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditSupport.javaindex ed4cc557cc..bf2d6ddd05 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditSupport.java@@ -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.model.support.jobexecutor.ServiceLocator;+import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.javaindex c50433311a..2340acff8f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.java@@ -25,7 +25,7 @@ import org.apache.wicket.model.Model;import com.google.common.collect.Sets;-import io.onedev.server.model.support.jobexecutor.ServiceLocator;+import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.page.layout.SideFloating;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.javaindex 660efbff14..3a0a06b38b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java@@ -18,8 +18,6 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.EditableUtils;-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.annotation.Multiline;@@ -72,11 +70,6 @@ public class StringPropertyEditor extends PropertyEditor<String> {input.add(AttributeModifier.replace("placeholder", EditableUtils.getDisplayName(getter)));}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {return input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex 0c81faedcb..5688d11534 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -18,12 +18,10 @@ import io.onedev.server.OneDev;import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;-import io.onedev.server.util.OneContext;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.component.user.choice.UserChoiceProvider;import io.onedev.server.web.component.user.choice.UserMultiChoice;-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.annotation.UserChoice;@@ -45,9 +43,9 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {protected void onInitialize() {super.onInitialize();- OneContext oneContext = new OneContext(this);+ ComponentContext componentContext = new ComponentContext(this);- OneContext.push(oneContext);+ ComponentContext.push(componentContext);try {UserChoice userChoice = descriptor.getPropertyGetter().getAnnotation(UserChoice.class);Preconditions.checkNotNull(userChoice);@@ -58,7 +56,7 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {choices.addAll(OneDev.getInstance(CacheManager.class).getUsers().values());}} finally {- OneContext.pop();+ ComponentContext.pop();}List<UserFacade> users = new ArrayList<>();@@ -96,11 +94,6 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected List<String> convertInputToValue() throws ConversionException {List<String> userNames = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex 3141161101..111843c671 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -16,12 +16,10 @@ import io.onedev.server.OneDev;import io.onedev.server.cache.CacheManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;-import io.onedev.server.util.OneContext;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.component.user.choice.UserChoiceProvider;import io.onedev.server.web.component.user.choice.UserSingleChoice;-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.annotation.UserChoice;@@ -43,9 +41,9 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- OneContext oneContext = new OneContext(this);+ ComponentContext componentContext = new ComponentContext(this);- OneContext.push(oneContext);+ ComponentContext.push(componentContext);try {UserChoice userChoice = descriptor.getPropertyGetter().getAnnotation(UserChoice.class);Preconditions.checkNotNull(userChoice);@@ -56,7 +54,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {choices.addAll(OneDev.getInstance(CacheManager.class).getUsers().values());}} finally {- OneContext.pop();+ ComponentContext.pop();}User user;@@ -97,11 +95,6 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {add(input);}- @Override- public ErrorContext getErrorContext(PathElement element) {- return null;- }-@Overrideprotected String convertInputToValue() throws ConversionException {UserFacade user = input.getConvertedInput();diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.javaindex cc0206b169..d6fb0256b7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java@@ -5,10 +5,13 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentityAware;+import io.onedev.server.util.scriptidentity.SiteAdministrator;import io.onedev.server.web.page.layout.LayoutPage;@SuppressWarnings("serial")-public abstract class AdministrationPage extends LayoutPage {+public abstract class AdministrationPage extends LayoutPage implements ScriptIdentityAware {public AdministrationPage(PageParameters params) {super(params);@@ -30,4 +33,9 @@ public abstract class AdministrationPage extends LayoutPage {response.render(CssHeaderItem.forReference(new AdministrationResourceReference()));}+ @Override+ public ScriptIdentity getScriptIdentity() {+ return new SiteAdministrator();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.javaindex cf184be87a..25bd0da324 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.admin.authenticator;import java.io.Serializable;-import io.onedev.server.model.support.authenticator.Authenticator;+import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.javaindex 924b8b968c..abc92a8133 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java@@ -21,7 +21,7 @@ import com.google.common.base.Joiner;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.authenticator.Authenticated;+import io.onedev.server.model.support.administration.authenticator.Authenticated;import io.onedev.server.util.JobLogger;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.taskbutton.TaskButton;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/BackupSettingHolder.java b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/BackupSettingHolder.javaindex f8931d0cc4..8c5068d087 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/BackupSettingHolder.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/BackupSettingHolder.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.admin.databasebackup;import java.io.Serializable;-import io.onedev.server.model.support.setting.BackupSetting;+import io.onedev.server.model.support.administration.BackupSetting;import io.onedev.server.web.editable.annotation.Editable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.htmlnew file mode 100644index 0000000000..ec37fa74d2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.html@@ -0,0 +1,17 @@+<wicket:panel>+ <form wicket:id="form" class="groovy-script-edit leave-confirm">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Edit Groovy Script+ </h4>+ </div>+ <div class="modal-body">+ <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/page/admin/groovyscript/GroovyScriptEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.javanew file mode 100644index 0000000000..b4d3ac19a3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptEditPanel.java@@ -0,0 +1,110 @@+package io.onedev.server.web.page.admin.groovyscript;++import java.util.List;++import org.apache.commons.lang3.SerializationUtils;+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 io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.groovyscript.GroovyScript;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;++@SuppressWarnings("serial")+abstract class GroovyScriptEditPanel extends Panel {++ private final int scriptIndex;++ public GroovyScriptEditPanel(String id, int scriptIndex) {+ super(id);++ this.scriptIndex = scriptIndex;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ GroovyScript script;+ if (scriptIndex != -1)+ script = SerializationUtils.clone(getScripts().get(scriptIndex));+ else+ script = new GroovyScript();++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ }++ };++ form.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(GroovyScriptEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });++ BeanEditor editor = BeanContext.edit("editor", script);+ form.add(editor);+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ if (scriptIndex != -1)+ getScripts().set(scriptIndex, script);+ else+ getScripts().add(script);+ OneDev.getInstance(SettingManager.class).saveGroovyScripts(getScripts());+ onSave(target);+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(GroovyScriptEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ form.setOutputMarkupId(true);++ add(form);+ }++ protected abstract List<GroovyScript> getScripts();++ protected abstract void onSave(AjaxRequestTarget target);++ protected abstract void onCancel(AjaxRequestTarget target);++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.htmlnew file mode 100644index 0000000000..4995565900--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html@@ -0,0 +1,27 @@+<wicket:extend>+ <div class="page-title">Groovy Scripts</div>+ <div class="groovy-scripts def-list list">+ <div class="head clearfix">+ <div class="pull-left">+ <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>+ </div>+ </div>+ <div class="body">+ <table wicket:id="scripts" class="table table-hover"></table>+ <div class="help-block"><i class="fa fa-info-circle"></i> All Groovy scripts used across the system+ should be defined here and reviewed by the site administrator for security reasons. For a given+ name, the first authorized script will be used</div>+ </div>+ </div>+ <wicket:fragment wicket:id="columnFrag">+ <a wicket:id="link"><span wicket:id="label"></span> </a>+ </wicket:fragment>+ <wicket:fragment wicket:id="viewScriptFrag">+ <div class="actions">+ <a wicket:id="edit" class="btn btn-sm btn-default"><i class="fa fa-pencil"></i> Edit</a>+ <a wicket:id="delete" class="btn btn-sm btn-default"><i class="fa fa-trash"></i> Delete</a>+ </div>+ <div wicket:id="feedback"></div>+ <div wicket:id="viewer"></div>+ </wicket:fragment>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.javanew file mode 100644index 0000000000..0f485fee3b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java@@ -0,0 +1,308 @@+package io.onedev.server.web.page.admin.groovyscript;++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.attributes.AjaxRequestAttributes;+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.list.LoopItem;+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.request.mapper.parameter.PageParameters;+import org.unbescape.html.HtmlEscape;++import com.google.common.collect.Sets;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.groovyscript.GroovyScript;+import io.onedev.server.web.ajaxlistener.ConfirmListener;+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.BeanContext;+import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.page.layout.SideFloating;++@SuppressWarnings("serial")+public class GroovyScriptListPage extends AdministrationPage {++ private final List<GroovyScript> scripts;++ public GroovyScriptListPage(PageParameters params) {+ super(params);+ scripts = OneDev.getInstance(SettingManager.class).getGroovyScripts();+ }++ private DataTable<GroovyScript, Void> scriptsTable;++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ModalLink("addNew") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new GroovyScriptEditPanel(id, -1) {++ @Override+ protected void onSave(AjaxRequestTarget target) {+ target.add(scriptsTable);+ modal.close();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected List<GroovyScript> getScripts() {+ return scripts;+ }++ };+ }++ });++ List<IColumn<GroovyScript, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(LoopItem.class).getIndex()) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, "<span class=\"drag-indicator fa fa-reorder\"></span> "+ + HtmlEscape.escapeHtml5(rowModel.getObject().getName())).setEscapeModelStrings(false);+ }++ });+ }+ });++ columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Description")) {++ @Override+ public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(LoopItem.class).getIndex()) {++ @Override+ protected Component newLabel(String componentId) {+ String description = rowModel.getObject().getDescription();+ if (description != null)+ return new Label(componentId, description);+ else+ return new Label(componentId, "<i>No description<i>").setEscapeModelStrings(false);+ }++ });+ }++ });++ columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Can be Used by Jobs")) {++ @Override+ public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {+ GroovyScript script = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(LoopItem.class).getIndex()) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, StringUtils.describe(script.getJobAuthorization() != null));+ }++ });+ }++ });++ columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {+ cellItem.add(new ColumnFragment(componentId, 0) {++ @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<GroovyScript> dataProvider = new ListDataProvider<GroovyScript>() {++ @Override+ protected List<GroovyScript> getData() {+ return scripts;+ }++ };++ add(scriptsTable = new DataTable<GroovyScript, Void>("scripts", columns, dataProvider, Integer.MAX_VALUE));+ scriptsTable.addTopToolbar(new HeadersToolbar<Void>(scriptsTable, null));+ scriptsTable.addBottomToolbar(new NoRecordsToolbar(scriptsTable));+ scriptsTable.setOutputMarkupId(true);++ scriptsTable.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(scripts, fromIndex+i, fromIndex+i+1);+ } else {+ for (int i=0; i<fromIndex-toIndex; i++)+ Collections.swap(scripts, fromIndex-i, fromIndex-i-1);+ }++ OneDev.getInstance(SettingManager.class).saveGroovyScripts(scripts);+ target.add(scriptsTable);+ }++ }.sortable("tbody"));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new GroovyScriptResourceReference()));+ }++ private abstract class ColumnFragment extends Fragment {++ private final int scriptIndex;++ public ColumnFragment(String id, int scriptIndex) {+ super(id, "columnFrag", GroovyScriptListPage.this);+ this.scriptIndex = scriptIndex;+ }++ 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, SideFloating.Placement.RIGHT) {++ private GroovyScript getScript() {+ return scripts.get(scriptIndex);+ }++ @Override+ protected String getTitle() {+ return getScript().getName();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(AttributeAppender.append("class", "groovy-script def-detail"));+ }++ @Override+ protected Component newBody(String id) {+ SideFloating sideFloating = this;+ Fragment fragment = new Fragment(id, "viewScriptFrag", GroovyScriptListPage.this);+ fragment.add(BeanContext.view("viewer", getScript(), Sets.newHashSet("name"), true));+ fragment.add(new ModalLink("edit") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ sideFloating.close();+ return new GroovyScriptEditPanel(id, scriptIndex) {++ @Override+ protected void onSave(AjaxRequestTarget target) {+ target.add(scriptsTable);+ modal.close();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected List<GroovyScript> getScripts() {+ return scripts;+ }++ };+ }++ });+ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this script?"));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ scripts.remove(scriptIndex);+ OneDev.getInstance(SettingManager.class).saveGroovyScripts(scripts);+ target.add(scriptsTable);+ close();+ }++ });++ fragment.add(new NotificationPanel("feedback", fragment));+ fragment.setOutputMarkupId(true);++ return fragment;+ }++ };+ }++ };+ link.add(newLabel("label"));+ add(link);+ }++ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptResourceReference.javanew file mode 100644index 0000000000..7db9880754--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.admin.groovyscript;++import org.apache.wicket.request.resource.CssResourceReference;++public class GroovyScriptResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public GroovyScriptResourceReference() {+ super(GroovyScriptResourceReference.class, "groovy-script.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/groovy-script.css b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/groovy-script.cssnew file mode 100644index 0000000000..92b2a58743--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/groovy-script.css@@ -0,0 +1,8 @@+.groovy-script.def-detail td.name {+ width: 120px !important;+}+@media(min-width: 768px) {+.groovy-script.floating.side.def-detail {+ width: 600px;+}+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.javaindex 62a73e2eaf..f8a2308904 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java@@ -25,7 +25,8 @@ import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")@@ -84,10 +85,10 @@ public class GroupProfilePage extends GroupPage {GroupManager groupManager = OneDev.getInstance(GroupManager.class);Group groupWithSameName = groupManager.find(group.getName());if (groupWithSameName != null && !groupWithSameName.equals(group)) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another group.");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another group.");}- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {groupManager.save(group, oldName);setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(group));Session.get().success("Profile updated");diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.javaindex d207c07eae..16cdb7d12d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java@@ -18,7 +18,8 @@ import io.onedev.server.model.Group;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")@@ -50,10 +51,10 @@ public class NewGroupPage extends AdministrationPage {GroupManager groupManager = OneDev.getInstance(GroupManager.class);Group groupWithSameName = groupManager.find(group.getName());if (groupWithSameName != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another group");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another group");}- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {group.setAdministrator(administratorInput.getModelObject());group.setCanCreateProjects(canCreateProjectsInput.getModelObject());groupManager.save(group, null);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.htmlindex d3160f4225..d737da3427 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.html@@ -11,11 +11,7 @@A certain project can override this setting to define its own issue boards.</div></div></div>- <wicket:fragment wicket:id="nameColumnFrag">- <span class="drag-indicator fa fa-reorder"></span>- <a wicket:id="link"><span wicket:id="label"></span></a>- </wicket:fragment>- <wicket:fragment wicket:id="otherColumnFrag">+ <wicket:fragment wicket:id="columnFrag"><a wicket:id="link"><span wicket:id="label"></span></a></wicket:fragment><wicket:fragment wicket:id="viewBoardFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.javaindex 862965ffb1..72ee47fe5f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java@@ -26,13 +26,14 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.unbescape.html.HtmlEscape;import com.google.common.base.Preconditions;+import com.google.common.collect.Sets;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.BoardSpec;-import io.onedev.server.model.support.setting.GlobalIssueSetting;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;@@ -41,7 +42,6 @@ import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.layout.SideFloating;-import com.google.common.collect.Sets;@SuppressWarnings("serial")public class DefaultBoardListPage extends GlobalIssueSettingPage {@@ -93,21 +93,16 @@ public class DefaultBoardListPage extends GlobalIssueSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {- Fragment fragment = new Fragment(componentId, "nameColumnFrag", DefaultBoardListPage.this);BoardSpec board = rowModel.getObject();- int index = getBoardSpecIndex(board.getName());- Preconditions.checkState(index != -1);- AjaxLink<Void> link = new AjaxLink<Void>("link") {+ cellItem.add(new ColumnFragment(componentId, board) {@Override- public void onClick(AjaxRequestTarget target) {- newBoardDetail(target, index);+ protected Component newLabel(String componentId) {+ return new Label(componentId, "<span class=\"drag-indicator fa fa-reorder\"></span> "+ + HtmlEscape.escapeHtml5(board.getName())).setEscapeModelStrings(false);}- };- link.add(new Label("label", board.getName()));- fragment.add(link);- cellItem.add(fragment);+ });}});@@ -115,21 +110,15 @@ public class DefaultBoardListPage extends GlobalIssueSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {- Fragment fragment = new Fragment(componentId, "otherColumnFrag", DefaultBoardListPage.this);BoardSpec board = rowModel.getObject();- int index = getBoardSpecIndex(board.getName());- Preconditions.checkState(index != -1);- AjaxLink<Void> link = new AjaxLink<Void>("link") {+ cellItem.add(new ColumnFragment(componentId, board) {@Override- public void onClick(AjaxRequestTarget target) {- newBoardDetail(target, index);+ protected Component newLabel(String componentId) {+ return new Label(componentId, board.getIdentifyField());}- };- link.add(new Label("label", rowModel.getObject().getIdentifyField()));- fragment.add(link);- cellItem.add(fragment);+ });}});@@ -138,32 +127,26 @@ public class DefaultBoardListPage extends GlobalIssueSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {- Fragment fragment = new Fragment(componentId, "otherColumnFrag", DefaultBoardListPage.this);BoardSpec board = rowModel.getObject();- int index = getBoardSpecIndex(board.getName());- Preconditions.checkState(index != -1);- AjaxLink<Void> link = new AjaxLink<Void>("link") {-- @Override- public void onClick(AjaxRequestTarget target) {- newBoardDetail(target, index);- }-- };List<String> columnsForDisplay = new ArrayList<>();for (String column: rowModel.getObject().getColumns()) {if (column == null) {GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- InputSpec field = issueSetting.getFieldSpec(board.getIdentifyField());+ FieldSpec field = issueSetting.getFieldSpec(board.getIdentifyField());if (field != null)columnsForDisplay.add("<i>" + HtmlEscape.escapeHtml5(field.getNameOfEmptyValue()) + "</i>");} else {columnsForDisplay.add(HtmlEscape.escapeHtml5(column));}}- link.add(new Label("label", StringUtils.join(columnsForDisplay)).setEscapeModelStrings(false));- fragment.add(link);- cellItem.add(fragment);+ cellItem.add(new ColumnFragment(componentId, board) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, StringUtils.join(columnsForDisplay)).setEscapeModelStrings(false);+ }++ });}});@@ -203,76 +186,102 @@ public class DefaultBoardListPage extends GlobalIssueSettingPage {}.sortable("tbody"));}- private void newBoardDetail(AjaxRequestTarget target, int index) {- new SideFloating(target, SideFloating.Placement.RIGHT) {+ private abstract class ColumnFragment extends Fragment {- private BoardSpec getBoard() {- return getSetting().getDefaultBoardSpecs().get(index);-- }- @Override- protected String getTitle() {- return getBoard().getName();- }+ private final BoardSpec board;++ public ColumnFragment(String id, BoardSpec board) {+ super(id, "columnFrag", DefaultBoardListPage.this);+ this.board = board;+ }- @Override- protected void onInitialize() {- super.onInitialize();- add(AttributeAppender.append("class", "board-spec def-detail"));- }+ @Override+ protected void onInitialize() {+ super.onInitialize();++ int index = getBoardSpecIndex(board.getName());+ Preconditions.checkState(index != -1);+ AjaxLink<Void> link = new AjaxLink<Void>("link") {- @Override- protected Component newBody(String id) {- SideFloating sideFloating = this;- Fragment fragment = new Fragment(id, "viewBoardFrag", DefaultBoardListPage.this);- fragment.add(BeanContext.view("viewer", getBoard(), Sets.newHashSet("name"), true));- fragment.add(new ModalLink("edit") {+ @Override+ public void onClick(AjaxRequestTarget target) {+ new SideFloating(target, SideFloating.Placement.RIGHT) {- @Override- protected Component newContent(String id, ModalPanel modal) {- sideFloating.close();- return new BoardEditPanel(id, getSetting().getDefaultBoardSpecs(), index) {-- @Override- protected void onBoardSaved(AjaxRequestTarget target, BoardSpec board) {- target.add(boardsTable);- modal.close();- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- };- }-- });- fragment.add(new AjaxLink<Void>("delete") {+ private BoardSpec getBoard() {+ return getSetting().getDefaultBoardSpecs().get(index);++ }+ @Override+ protected String getTitle() {+ return getBoard().getName();+ }- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this board?"));- }+ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(AttributeAppender.append("class", "board-spec def-detail"));+ }- @Override- public void onClick(AjaxRequestTarget target) {- getSetting().getDefaultBoardSpecs().remove(index);- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());- target.add(boardsTable);- close();- }-- });-- fragment.setOutputMarkupId(true);-- return fragment;- }+ @Override+ protected Component newBody(String id) {+ SideFloating sideFloating = this;+ Fragment fragment = new Fragment(id, "viewBoardFrag", DefaultBoardListPage.this);+ fragment.add(BeanContext.view("viewer", getBoard(), Sets.newHashSet("name"), true));+ fragment.add(new ModalLink("edit") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ sideFloating.close();+ return new BoardEditPanel(id, getSetting().getDefaultBoardSpecs(), index) {++ @Override+ protected void onBoardSaved(AjaxRequestTarget target, BoardSpec board) {+ target.add(boardsTable);+ modal.close();+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ };+ }++ });+ fragment.add(new AjaxLink<Void>("delete") {- };+ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this board?"));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ getSetting().getDefaultBoardSpecs().remove(index);+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());+ target.add(boardsTable);+ close();+ }++ });++ fragment.setOutputMarkupId(true);++ return fragment;+ }++ };+ }++ };+ link.add(newLabel("label"));+ add(link);+ }++ protected abstract Component newLabel(String componentId);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.javaindex dddaa2a90a..1398eb0aa8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java@@ -4,7 +4,7 @@ import java.io.Serializable;import javax.validation.constraints.NotNull;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.web.editable.annotation.Editable;@Editable@@ -12,7 +12,7 @@ public class FieldBean implements Serializable {private static final long serialVersionUID = 1L;- private InputSpec field;+ private FieldSpec field;private boolean promptUponIssueOpen = true;@@ -20,11 +20,11 @@ public class FieldBean implements Serializable {@Editable(name="Type", order=100)@NotNull(message="may not be empty")- public InputSpec getField() {+ public FieldSpec getField() {return field;}- public void setField(InputSpec field) {+ public void setField(FieldSpec field) {this.field = field;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.javaindex 46858d0f54..3742ffec68 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java@@ -7,8 +7,6 @@ import java.util.List;import java.util.Map;import java.util.Set;-import javax.validation.ValidationException;-import org.apache.commons.lang3.SerializationUtils;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;@@ -20,18 +18,19 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.setting.GlobalIssueSetting;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.issue.fieldspec.ChoiceField;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.Path;+import io.onedev.server.web.editable.PathNode;@SuppressWarnings("serial")abstract class FieldEditPanel extends Panel implements InputContext {@@ -88,23 +87,21 @@ abstract class FieldEditPanel extends Panel implements InputContext {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- InputSpec field = bean.getField();+ FieldSpec field = bean.getField();if (fieldIndex != -1) {- InputSpec oldField = getSetting().getFieldSpecs().get(fieldIndex);+ FieldSpec oldField = getSetting().getFieldSpecs().get(fieldIndex);if (!field.getName().equals(oldField.getName()) && getSetting().getFieldSpec(field.getName()) != null) {- editor.getErrorContext(new PathElement.Named("field"))- .getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another field");+ editor.error(new Path(new PathNode.Named("field"), new PathNode.Named("name")),+ "This name has already been used by another field");}} else if (getSetting().getFieldSpec(field.getName()) != null) {- editor.getErrorContext(new PathElement.Named("field"))- .getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another field");+ editor.error(new Path(new PathNode.Named("field"), new PathNode.Named("name")),+ "This name has already been used by another field");}- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {if (fieldIndex != -1) {- InputSpec oldField = getSetting().getFieldSpecs().get(fieldIndex);+ FieldSpec oldField = getSetting().getFieldSpecs().get(fieldIndex);getSetting().getFieldSpecs().set(fieldIndex, field);getSetting().getDefaultPromptFieldsUponIssueOpen().remove(oldField.getName());getSetting().getDefaultListFields().remove(oldField.getName());@@ -112,9 +109,9 @@ abstract class FieldEditPanel extends Panel implements InputContext {getSetting().onRenameField(oldField.getName(), field.getName());getSetting().setReconciled(false);}- if (oldField instanceof ChoiceInput && field instanceof ChoiceInput) {- ChoiceInput oldChoiceInput = (ChoiceInput) oldField;- ChoiceInput choiceInput = (ChoiceInput) field;+ if (oldField instanceof ChoiceField && field instanceof ChoiceField) {+ ChoiceField oldChoiceInput = (ChoiceField) oldField;+ ChoiceField choiceInput = (ChoiceField) field;if (oldChoiceInput.getChoiceProvider() instanceof SpecifiedChoices&& choiceInput.getChoiceProvider() instanceof SpecifiedChoices) {SpecifiedChoices oldChoices = (SpecifiedChoices) oldChoiceInput.getChoiceProvider();@@ -194,7 +191,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {public List<String> getInputNames() {List<String> inputNames = new ArrayList<>();int currentIndex = 0;- for (InputSpec field: getSetting().getFieldSpecs()) {+ for (FieldSpec field: getSetting().getFieldSpecs()) {if (currentIndex != fieldIndex)inputNames.add(field.getName());currentIndex++;@@ -206,11 +203,5 @@ abstract class FieldEditPanel extends Panel implements InputContext {public InputSpec getInputSpec(String inputName) {return getSetting().getFieldSpec(inputName);}-- @Override- public void validateName(String inputName) {- if (IssueConstants.ALL_FIELDS.contains(inputName))- throw new ValidationException("'" + inputName + "' is reserved");- }-+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.javaindex 2a3423999f..50bbc416cf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.java@@ -10,7 +10,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.htmlindex 129e41f219..3c551ec6fb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html@@ -9,11 +9,7 @@<div class="help-block"><i class="fa fa-info-circle"></i> Define all custom issue fields here. Each project candecide to use all or a subset of these fields via its issue transition setting</div></div>- <wicket:fragment wicket:id="nameColumnFrag">- <span class="fa fa-reorder drag-indicator"></span>- <a wicket:id="link"><span wicket:id="label"></span></a>- </wicket:fragment>- <wicket:fragment wicket:id="otherColumnFrag">+ <wicket:fragment wicket:id="columnFrag"><a wicket:id="link"><span wicket:id="label"></span></a></wicket:fragment><wicket:fragment wicket:id="viewFieldFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.javaindex a8443b8e61..5e065b343f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java@@ -23,14 +23,16 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.unbescape.html.HtmlEscape;import com.google.common.base.Preconditions;+import com.google.common.collect.Sets;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.setting.GlobalIssueSetting;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;@@ -39,7 +41,6 @@ import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;-import com.google.common.collect.Sets;@SuppressWarnings("serial")public class IssueFieldListPage extends GlobalIssueSettingPage {@@ -48,7 +49,7 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {super(params);}- private DataTable<InputSpec, Void> fieldsTable;+ private DataTable<FieldSpec, Void> fieldsTable;@Overrideprotected void onInitialize() {@@ -81,29 +82,31 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {});- List<IColumn<InputSpec, Void>> columns = new ArrayList<>();+ List<IColumn<FieldSpec, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Name")) {+ columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("Name")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- cellItem.add(new ColumnFragment(componentId, rowModel, true) {+ public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {+ FieldSpec field = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, field) {@Overrideprotected Component newLabel(String componentId) {- return new Label(componentId, rowModel.getObject().getName());+ return new Label(componentId, "<span class=\"drag-indicator fa fa-reorder\"></span> "+ + HtmlEscape.escapeHtml5(field.getName())).setEscapeModelStrings(false);}});}});- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Type")) {+ columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("Type")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- InputSpec field = rowModel.getObject();- cellItem.add(new ColumnFragment(componentId, rowModel, false) {+ public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {+ FieldSpec field = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, field) {@Overrideprotected Component newLabel(String componentId) {@@ -114,31 +117,35 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {}});- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Prompt upon Issue Open")) {+ columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("Description")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- cellItem.add(new ColumnFragment(componentId, rowModel, false) {+ public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {+ FieldSpec field = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, field) {@Overrideprotected Component newLabel(String componentId) {- InputSpec field = rowModel.getObject();- return new Label(componentId, StringUtils.describe(getSetting().getDefaultPromptFieldsUponIssueOpen().contains(field.getName())));+ String description = field.getDescription();+ if (description != null)+ return new Label(componentId, description);+ else+ return new Label(componentId, "<i>No description</i>").setEscapeModelStrings(false);}});}});- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Display in Issue List")) {+ columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("Display in Issue List")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- cellItem.add(new ColumnFragment(componentId, rowModel, false) {+ public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {+ FieldSpec field = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, field) {@Overrideprotected Component newLabel(String componentId) {- InputSpec field = rowModel.getObject();return new Label(componentId, StringUtils.describe(getSetting().getDefaultListFields().contains(field.getName())));}@@ -152,11 +159,11 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {});- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("")) {+ columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("")) {@Override- public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- cellItem.add(new ColumnFragment(componentId, rowModel, false) {+ public void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {+ cellItem.add(new ColumnFragment(componentId, rowModel.getObject()) {@Overrideprotected Component newLabel(String componentId) {@@ -173,16 +180,16 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {});- IDataProvider<InputSpec> dataProvider = new ListDataProvider<InputSpec>() {+ IDataProvider<FieldSpec> dataProvider = new ListDataProvider<FieldSpec>() {@Override- protected List<InputSpec> getData() {+ protected List<FieldSpec> getData() {return getSetting().getFieldSpecs();}};- add(fieldsTable = new DataTable<InputSpec, Void>("issueFields", columns, dataProvider, Integer.MAX_VALUE));+ add(fieldsTable = new DataTable<FieldSpec, Void>("issueFields", columns, dataProvider, Integer.MAX_VALUE));fieldsTable.addTopToolbar(new HeadersToolbar<Void>(fieldsTable, null));fieldsTable.addBottomToolbar(new NoRecordsToolbar(fieldsTable));fieldsTable.setOutputMarkupId(true);@@ -218,16 +225,11 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {private abstract class ColumnFragment extends Fragment {- private final int index;-- public ColumnFragment(String id, IModel<InputSpec> model, boolean nameColumn) {- super(id, nameColumn?"nameColumnFrag":"otherColumnFrag", IssueFieldListPage.this, model);- this.index = getFieldSpecIndex(getField().getName());- Preconditions.checkState(this.index != -1);- }+ private final FieldSpec field;- private InputSpec getField() {- return (InputSpec) getDefaultModelObject();+ public ColumnFragment(String id, FieldSpec field) {+ super(id, "columnFrag", IssueFieldListPage.this);+ this.field = field;}protected abstract Component newLabel(String componentId);@@ -235,6 +237,10 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {@Overrideprotected void onInitialize() {super.onInitialize();++ int index = getFieldSpecIndex(field.getName());+ Preconditions.checkState(index != -1);+AjaxLink<Void> link = new AjaxLink<Void>("link") {@Override@@ -243,7 +249,7 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {@Overrideprotected String getTitle() {- return getField().getName() + " (type: " + EditableUtils.getDisplayName(getField().getClass()) + ")";+ return field.getName() + " (type: " + EditableUtils.getDisplayName(field.getClass()) + ")";}@Override@@ -256,10 +262,10 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {protected Component newBody(String id) {SideFloating sideFloating = this;Fragment fragment = new Fragment(id, "viewFieldFrag", IssueFieldListPage.this);- fragment.add(BeanContext.view("viewer1", getField(), Sets.newHashSet("name"), true));+ fragment.add(BeanContext.view("viewer1", field, Sets.newHashSet("name"), true));FieldBean bean = new FieldBean();- bean.setPromptUponIssueOpen(getSetting().getDefaultPromptFieldsUponIssueOpen().contains(getField().getName()));- bean.setDisplayInIssueList(getSetting().getDefaultListFields().contains(getField().getName()));+ bean.setPromptUponIssueOpen(getSetting().getDefaultPromptFieldsUponIssueOpen().contains(field.getName()));+ bean.setDisplayInIssueList(getSetting().getDefaultListFields().contains(field.getName()));fragment.add(BeanContext.view("viewer2", bean, Sets.newHashSet("field"), true));fragment.add(new ModalLink("edit") {@@ -299,9 +305,9 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {@Overridepublic void onClick(AjaxRequestTarget target) {getSetting().getFieldSpecs().remove(index);- getSetting().getDefaultPromptFieldsUponIssueOpen().remove(getField().getName());- getSetting().getDefaultListFields().remove(getField().getName());- getSetting().onDeleteField(getField().getName());+ getSetting().getDefaultPromptFieldsUponIssueOpen().remove(field.getName());+ getSetting().getDefaultListFields().remove(field.getName());+ getSetting().onDeleteField(field.getName());getSetting().setReconciled(false);OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());target.add(fieldsTable);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.properties b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.propertiesdeleted file mode 100644index ceb97d1e7f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.properties+++ /dev/null@@ -1,6 +0,0 @@-resource.input.input=When field-resource.input.description=Optionally describes the custom field-resource.input.showCondition=Enable if visibility of this field depends on other fields-resource.input.allowEmpty=Whether or not this field accepts empty value-resource.input.allowMultiple=Whether or not multiple values can be specified for this field-resource.input.canBeChangedBy=This setting tells who can change this field when issue is opened or transited\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.htmlindex b82d6f6d8e..634b01d7b6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html@@ -12,11 +12,7 @@decide to use all or a subset of these states via its issue transition setting</div></div></div>- <wicket:fragment wicket:id="nameColumnFrag">- <span class="drag-indicator fa fa-reorder"></span>- <a wicket:id="link"><span wicket:id="label"></span> <label wicket:id="initial" class="label label-default">Initial</label></a>- </wicket:fragment>- <wicket:fragment wicket:id="otherColumnFrag">+ <wicket:fragment wicket:id="columnFrag"><a wicket:id="link"><span wicket:id="label"></span></a></wicket:fragment><wicket:fragment wicket:id="viewStateFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.javaindex 5220318f4f..0f690e59c1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java@@ -16,7 +16,6 @@ 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.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;@@ -25,14 +24,16 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.unbescape.html.HtmlEscape;import com.google.common.base.Preconditions;+import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.StateSpec;-import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;@@ -40,7 +41,6 @@ import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.layout.SideFloating;-import com.google.common.collect.Sets;@SuppressWarnings("serial")public class IssueStateListPage extends GlobalIssueSettingPage {@@ -96,22 +96,20 @@ public class IssueStateListPage extends GlobalIssueSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {- Fragment fragment = new Fragment(componentId, "nameColumnFrag", IssueStateListPage.this);StateSpec state = rowModel.getObject();- int index = getStateSpecIndex(state.getName());- Preconditions.checkState(index != -1);- AjaxLink<Void> link = new AjaxLink<Void>("link") {+ cellItem.add(new ColumnFragment(componentId, state) {@Override- public void onClick(AjaxRequestTarget target) {- newStateDetail(target, index);+ protected Component newLabel(String componentId) {+ String label = "<span class='drag-indicator fa fa-reorder'></span> "+ + HtmlEscape.escapeHtml5(state.getName());++ if (getStateSpecIndex(state.getName()) == 0)+ label += " <span class='label label-default'>Initial</span>";+ return new Label(componentId, label).setEscapeModelStrings(false);}- };- link.add(new Label("label", state.getName()));- link.add(new WebMarkupContainer("initial").setVisible(index == 0));- fragment.add(link);- cellItem.add(fragment);+ });}});@@ -119,21 +117,15 @@ public class IssueStateListPage extends GlobalIssueSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {- Fragment fragment = new Fragment(componentId, "otherColumnFrag", IssueStateListPage.this);StateSpec state = rowModel.getObject();- int index = getStateSpecIndex(state.getName());- Preconditions.checkState(index != -1);- AjaxLink<Void> link = new AjaxLink<Void>("link") {+ cellItem.add(new ColumnFragment(componentId, state) {@Override- public void onClick(AjaxRequestTarget target) {- newStateDetail(target, index);+ protected Component newLabel(String componentId) {+ return new Label(componentId, StringUtils.capitalize(state.getCategory().name().toLowerCase()));}- };- link.add(new Label("label", StringUtils.capitalize(rowModel.getObject().getCategory().name().toLowerCase())));- fragment.add(link);- cellItem.add(fragment);+ });}});@@ -142,51 +134,36 @@ public class IssueStateListPage extends GlobalIssueSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {- Fragment fragment = new Fragment(componentId, "otherColumnFrag", IssueStateListPage.this);StateSpec state = rowModel.getObject();- int index = getStateSpecIndex(state.getName());- Preconditions.checkState(index != -1);- AjaxLink<Void> link = new AjaxLink<Void>("link") {+ cellItem.add(new ColumnFragment(componentId, state) {@Override- public void onClick(AjaxRequestTarget target) {- newStateDetail(target, index);+ protected Component newLabel(String componentId) {+ return new Label(componentId).add(AttributeAppender.append("style", "background: " + state.getColor() + ";"));}- };- link.add(new Label("label").add(AttributeAppender.append("style", "background: " + state.getColor() + ";")));- fragment.add(AttributeAppender.append("class", "color"));- fragment.add(link);- cellItem.add(fragment);+ }.add(AttributeAppender.append("class", "color")));}});- columns.add(new AbstractColumn<StateSpec, Void>(Model.of("")) {+ columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Description")) {@Overridepublic void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {- Fragment fragment = new Fragment(componentId, "otherColumnFrag", IssueStateListPage.this);StateSpec state = rowModel.getObject();- int index = getStateSpecIndex(state.getName());- Preconditions.checkState(index != -1);- AjaxLink<Void> link = new AjaxLink<Void>("link") {+ cellItem.add(new ColumnFragment(componentId, state) {@Override- public void onClick(AjaxRequestTarget target) {- newStateDetail(target, index);+ protected Component newLabel(String componentId) {+ String description = state.getDescription();+ if (description != null)+ return new Label(componentId, description);+ else+ return new Label(componentId, "<i>No description</i>").setEscapeModelStrings(false);}- };- link.add(new Label("label", "<i class='fa fa-ellipsis-h'></i>").setEscapeModelStrings(false));- fragment.add(link);- cellItem.add(fragment);-- }-- @Override- public String getCssClass() {- return "ellipsis";+ });}});@@ -226,84 +203,108 @@ public class IssueStateListPage extends GlobalIssueSettingPage {}.sortable("tbody"));}- private void newStateDetail(AjaxRequestTarget target, int index) {- new SideFloating(target, SideFloating.Placement.RIGHT) {+ private abstract class ColumnFragment extends Fragment {- private StateSpec getState() {- return getSetting().getStateSpecs().get(index);- }-- @Override- protected String getTitle() {- return getState().getName();- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(AttributeAppender.append("class", "state-spec def-detail"));- }-- @Override- protected Component newBody(String id) {- SideFloating sideFloating = this;- Fragment fragment = new Fragment(id, "viewStateFrag", IssueStateListPage.this);- fragment.add(BeanContext.view("viewer", getState(), Sets.newHashSet("name"), true));- fragment.add(new ModalLink("edit") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- sideFloating.close();- return new StateEditPanel(id, index) {-- @Override- protected void onSave(AjaxRequestTarget target) {- target.add(statesTable);- modal.close();- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- @Override- protected GlobalIssueSetting getSetting() {- return IssueStateListPage.this.getSetting();- }-- };- }-- });- fragment.add(new AjaxLink<Void>("delete") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this state?"));- }+ private final StateSpec state;++ public ColumnFragment(String id, StateSpec state) {+ super(id, "columnFrag", IssueStateListPage.this);+ this.state = state;+ }- @Override- public void onClick(AjaxRequestTarget target) {- StateSpec state = getState();- getSetting().getStateSpecs().remove(index);- getSetting().onDeleteState(state.getName());- getSetting().setReconciled(false);- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());- target.add(statesTable);- close();- }-- });-- fragment.add(new NotificationPanel("feedback", fragment));- fragment.setOutputMarkupId(true);+ @Override+ protected void onInitialize() {+ super.onInitialize();+ int index = getStateSpecIndex(state.getName());+ Preconditions.checkState(index != -1);+ AjaxLink<Void> link = new AjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new SideFloating(target, SideFloating.Placement.RIGHT) {++ private StateSpec getState() {+ return getSetting().getStateSpecs().get(index);+ }++ @Override+ protected String getTitle() {+ return getState().getName();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(AttributeAppender.append("class", "state-spec def-detail"));+ }++ @Override+ protected Component newBody(String id) {+ SideFloating sideFloating = this;+ Fragment fragment = new Fragment(id, "viewStateFrag", IssueStateListPage.this);+ fragment.add(BeanContext.view("viewer", getState(), Sets.newHashSet("name"), true));+ fragment.add(new ModalLink("edit") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ sideFloating.close();+ return new StateEditPanel(id, index) {++ @Override+ protected void onSave(AjaxRequestTarget target) {+ target.add(statesTable);+ modal.close();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected GlobalIssueSetting getSetting() {+ return IssueStateListPage.this.getSetting();+ }++ };+ }++ });+ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this state?"));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ StateSpec state = getState();+ getSetting().getStateSpecs().remove(index);+ getSetting().onDeleteState(state.getName());+ getSetting().setReconciled(false);+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());+ target.add(statesTable);+ close();+ }++ });++ fragment.add(new NotificationPanel("feedback", fragment));+ fragment.setOutputMarkupId(true);++ return fragment;+ }++ };+ }- return fragment;- }-- };+ };+ link.add(newLabel("label"));+ add(link);+ }++ protected abstract Component newLabel(String componentId);}-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.javaindex 2764905da1..3904bb24b8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java@@ -11,12 +11,13 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.StateSpec;-import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;@SuppressWarnings("serial")abstract class StateEditPanel extends Panel {@@ -75,15 +76,15 @@ abstract class StateEditPanel extends Panel {if (stateIndex != -1) {StateSpec oldState = getSetting().getStateSpecs().get(stateIndex);if (!state.getName().equals(oldState.getName()) && getSetting().getStateSpec(state.getName()) != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another state");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another state");}} else if (getSetting().getStateSpec(state.getName()) != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another state");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another state");}- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {if (stateIndex != -1) {StateSpec oldState = getSetting().getStateSpecs().get(stateIndex);getSetting().getStateSpecs().set(stateIndex, state);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.javaindex 2b96f2b109..d8d4db7610 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java@@ -4,7 +4,7 @@ import java.io.Serializable;import javax.validation.constraints.NotNull;-import io.onedev.server.model.support.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.web.editable.annotation.Editable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.javaindex f5b9514fbc..665b53bdac 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java@@ -15,7 +15,7 @@ import org.apache.wicket.util.visit.IVisit;import org.apache.wicket.util.visit.IVisitor;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.server.model.support.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.util.JobLogger;import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.component.taskbutton.TaskButton;@@ -56,7 +56,7 @@ abstract class JobExecutorEditPanel extends Panel {JobExecutor executor = bean.getExecutor();- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {if (executorIndex != -1) {executors.set(executorIndex, executor);} else {@@ -130,7 +130,7 @@ abstract class JobExecutorEditPanel extends Panel {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {if (testData != null) {new BeanEditModalPanel(target, testData) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.javaindex 15a38a12bb..e34054d9c6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java@@ -14,7 +14,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.page.admin.AdministrationPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.javaindex 99b9fd6fc0..27dd172d88 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java@@ -13,7 +13,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;-import io.onedev.server.model.support.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditableUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingHolder.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingHolder.javaindex c5d02f1dea..53cb953465 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingHolder.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingHolder.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.admin.mailsetting;import java.io.Serializable;-import io.onedev.server.model.support.setting.MailSetting;+import io.onedev.server.model.support.administration.MailSetting;import io.onedev.server.web.editable.annotation.Editable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.javaindex 4dbd82e20a..578c8a0777 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java@@ -5,7 +5,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.setting.SecuritySetting;+import io.onedev.server.model.support.administration.SecuritySetting;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.javaindex 971627a461..4cd210b176 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java@@ -5,7 +5,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.setting.SystemSetting;+import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.javaindex 543c310f90..85a9d969a4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java@@ -15,7 +15,8 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")@@ -44,15 +45,15 @@ public class NewUserPage extends AdministrationPage {UserManager userManager = OneDev.getInstance(UserManager.class);User userWithSameName = userManager.findByName(user.getName());if (userWithSameName != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another user.");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another user.");}User userWithSameEmail = userManager.findByEmail(user.getEmail());if (userWithSameEmail != null) {- editor.getErrorContext(new PathElement.Named("email"))- .addError("This email has already been used by another user.");+ editor.error(new Path(new PathNode.Named("email")),+ "This email has already been used by another user.");}- if (!editor.hasErrors(true)){+ if (editor.isValid()){user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(user.getPassword()));userManager.save(user, null);Session.get().success("New user created");diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex 95d64df821..4e829723ea 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -150,6 +150,11 @@ a.wicket_orderDown:AFTER {.pagination a.first, .pagination a.prev, .pagination a.next, .pagination a.last {font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;}+.table>thead+tfoot>tr>td.norecords-td>div {+ border-top: 2px solid #DDD;+ margin-top: -10px;+ padding-top: 10px;+}.norecords-td {font-style: italic;}@@ -574,6 +579,10 @@ a.disabled, a[disabled="disabled"] {.def-list table td.norecords-td {padding: 5px;}+.def-list table>tfoot>tr>td.norecords-td>div {+ margin-top: -7px;+ padding-top: 7px;+}.def-list table a {display: block;@@ -581,18 +590,6 @@ a.disabled, a[disabled="disabled"] {text-decoration: none;padding: 8px;}-.def-list table>tbody>tr>td:first-child>div {- position: relative;- top: 0;-}-.def-list table>tbody>tr>td:first-child>div>.drag-indicator {- position: absolute;- left: 6px;- top: 10px;-}-.def-list table>tbody>tr>td:first-child>div>a {- margin-left: 16px;-}.floating.side.def-detail {width: 480px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/ErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/error/ErrorPage.javaindex eed39d049c..22a2745cec 100644--- a/server-core/src/main/java/io/onedev/server/web/page/error/ErrorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/error/ErrorPage.java@@ -26,6 +26,8 @@ import io.onedev.server.web.page.project.ProjectListPage;@SuppressWarnings("serial")public class ErrorPage extends BasePage {+ private static final int MAX_TITLE_LEN = 240;+private String title;private String detailMessage;@@ -55,7 +57,7 @@ public class ErrorPage extends BasePage {container.setOutputMarkupId(true);add(container);- container.add(new Label("title", StringUtils.abbreviate(title, 80)));+ container.add(new Label("title", StringUtils.abbreviate(title, MAX_TITLE_LEN)));container.add(new ViewStateAwarePageLink<Void>("home", ProjectListPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/error/error-page.css b/server-core/src/main/java/io/onedev/server/web/page/error/error-page.cssindex d55b885e28..518877d8e8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/error/error-page.css+++ b/server-core/src/main/java/io/onedev/server/web/page/error/error-page.css@@ -10,7 +10,7 @@ body.error .center-box>div {}body.error .center-box>.title {- font-size: 24px;+ font-size: 20px;font-weight: bold;border: none;background: none;@@ -18,7 +18,7 @@ body.error .center-box>.title {}body.error .center-box .detail>.head {- font-size: 20px;+ font-size: 18px;margin-bottom: 20px;}body.error .center-box .detail>.body {diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 379475ca64..c6643ddfe9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -33,6 +33,7 @@<li wicket:id="mailSetting"><a wicket:id="link"><i class="fa fa-fw fa-envelope"></i> Mail Setting</a></li><li role="separator" class="divider"></li><li wicket:id="jobExecutors"><a wicket:id="link"><i class="fa fa-fw fa-cogs"></i> Job Executors</a></li>+ <li wicket:id="groovyScripts"><a wicket:id="link"><i class="fa fa-fw fa-file-code-o"></i> Groovy Scripts</a></li><li role="separator" class="divider"></li><li wicket:id="databaseBackup"><a wicket:id="link"><i class="fa fa-fw fa-database"></i> Database Backup</a></li><li wicket:id="serverLog"><a wicket:id="link"><i class="fa fa-fw fa-file-text-o"></i> Server Log</a></li>diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex fdfecc8e58..ab9ffbdaea 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -30,6 +30,7 @@ import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;+import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;import io.onedev.server.web.page.admin.group.GroupListPage;import io.onedev.server.web.page.admin.group.GroupPage;import io.onedev.server.web.page.admin.group.NewGroupPage;@@ -131,6 +132,11 @@ public abstract class LayoutPage extends BasePage {if (getPage() instanceof JobExecutorPage)item.add(AttributeAppender.append("class", "active"));+ administrationContainer.add(item = new WebMarkupContainer("groovyScripts"));+ item.add(new ViewStateAwarePageLink<Void>("link", GroovyScriptListPage.class));+ if (getPage() instanceof GroovyScriptListPage)+ item.add(AttributeAppender.append("class", "active"));+administrationContainer.add(item = new WebMarkupContainer("systemSetting"));item.add(new ViewStateAwarePageLink<Void>("link", SystemSettingPage.class));if (getPage() instanceof SystemSettingPage)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.javaindex 899a0cc7f6..4e1c96c4ae 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java@@ -14,7 +14,8 @@ import io.onedev.server.model.Project;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@@ -43,8 +44,8 @@ public class NewProjectPage extends LayoutPage {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);Project projectWithSameName = projectManager.find(project.getName());if (projectWithSameName != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another project");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another project");} else {projectManager.save(project, null);Session.get().success("New project created");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 7b037e1755..c89d7afd7d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -17,8 +17,6 @@ import org.apache.commons.lang3.SerializationUtils;import org.apache.commons.lang3.StringUtils;import org.apache.http.NameValuePair;import org.apache.http.client.utils.URIBuilder;-import org.apache.shiro.subject.Subject;-import org.apache.shiro.util.ThreadContext;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;@@ -79,6 +77,9 @@ import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.query.BlobQuery;import io.onedev.server.search.code.query.TextQuery;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.scriptidentity.JobIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentityAware;import io.onedev.server.web.PrioritizedComponentRenderer;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.floating.FloatingPanel;@@ -107,7 +108,7 @@ import io.onedev.server.web.websocket.PageDataChanged;import io.onedev.server.web.websocket.WebSocketManager;@SuppressWarnings("serial")-public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {+public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, ScriptIdentityAware {private static final String PARAM_REVISION = "revision";@@ -1011,7 +1012,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {String branch = state.blobIdent.revision;getProject().cacheObjectId(branch, refUpdated.getNewCommitId());- Subject subject = SecurityUtils.getSubject();Long projectId = project.getId();String refName = refUpdated.getRefName();ObjectId oldCommitId = refUpdated.getOldCommitId();@@ -1024,21 +1024,16 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {@Overridepublic void run() {- ThreadContext.bind(subject);- try {- Project project = OneDev.getInstance(ProjectManager.class).load(projectId);- project.cacheObjectId(branch, newCommitId);- RefUpdated refUpdated = new RefUpdated(project, refName, oldCommitId, newCommitId);- OneDev.getInstance(ListenerRegistry.class).post(refUpdated);- } finally {- ThreadContext.unbindSubject();- }+ Project project = OneDev.getInstance(ProjectManager.class).load(projectId);+ project.cacheObjectId(branch, newCommitId);+ RefUpdated refUpdated = new RefUpdated(project, refName, oldCommitId, newCommitId);+ OneDev.getInstance(ListenerRegistry.class).post(refUpdated);}});}- });+ }, SecurityUtils.getSubject());if (target != null) {BlobIdent newBlobIdent;@@ -1235,4 +1230,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {}}+ @Override+ public ScriptIdentity getScriptIdentity() {+ return new JobIdentity(getProject(), getCommit().copy());+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.javaindex 38ed9cb05a..96d1ae2485 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java@@ -36,11 +36,10 @@ import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.editable.PathElement.Indexed;-import io.onedev.server.web.editable.PathElement.Named;-import io.onedev.server.web.editable.ValuePath;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.PathNode.Indexed;+import io.onedev.server.web.editable.PathNode.Named;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.util.WicketUtils;@@ -189,27 +188,25 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpeCISpec ciSpec = (CISpec) parseResult;Validator validator = AppLoader.getInstance(Validator.class);for (ConstraintViolation<CISpec> violation: validator.validate(ciSpec)) {- ValuePath path = new ValuePath(violation.getPropertyPath());- if (path.getElements().isEmpty()) {+ Path path = new Path(violation.getPropertyPath());+ if (path.getNodes().isEmpty()) {error(violation.getMessage());} else {- PathElement.Named named = (Named) path.getElements().iterator().next();+ PathNode.Named named = (Named) path.getNodes().iterator().next();switch (named.getName()) {case "jobs":- path = new ValuePath(path.getElements().subList(1, path.getElements().size()));- if (path.getElements().isEmpty()) {+ path = new Path(path.getNodes().subList(1, path.getNodes().size()));+ if (path.getNodes().isEmpty()) {error("Jobs: " + violation.getMessage());} else {- PathElement.Indexed indexed = (Indexed) path.getElements().iterator().next();- path = new ValuePath(path.getElements().subList(1, path.getElements().size()));- if (path.getElements().isEmpty()) {+ PathNode.Indexed indexed = (Indexed) path.getNodes().iterator().next();+ path = new Path(path.getNodes().subList(1, path.getNodes().size()));+ if (path.getNodes().isEmpty()) {error("Job '" + ciSpec.getJobs().get(indexed.getIndex()).getName() + "': " + violation.getMessage());} else {@SuppressWarnings("deprecation")BeanEditor editor = (BeanEditor) jobContents.get(indexed.getIndex());- ErrorContext errorContext = editor.getErrorContext(path);- if (errorContext != null)- errorContext.addError(violation.getMessage());+ editor.error(path, violation.getMessage());}}break;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex d395c02c9a..3d07444cee 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -39,13 +39,16 @@ import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.ci.job.JobManager;import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;+import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.scriptidentity.JobIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentityAware;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;@@ -76,7 +79,7 @@ import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QueryPositionSupport;@SuppressWarnings("serial")-public abstract class BuildDetailPage extends ProjectPage implements InputContext {+public abstract class BuildDetailPage extends ProjectPage implements InputContext, ScriptIdentityAware {public static final String PARAM_BUILD = "build";@@ -503,13 +506,13 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContex}@Override- public InputSpec getInputSpec(String inputName) {- return Preconditions.checkNotNull(getBuild().getJob().getParamSpecMap().get(inputName));+ public ParamSpec getInputSpec(String paramName) {+ return Preconditions.checkNotNull(getBuild().getJob().getParamSpecMap().get(paramName));}@Override- public void validateName(String inputName) {- throw new UnsupportedOperationException();+ public ScriptIdentity getScriptIdentity() {+ return new JobIdentity(getBuild().getProject(), getBuild().getCommitId());}-+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.javaindex b6ab15b1bd..2f6a8a3bdd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java@@ -16,7 +16,8 @@ import io.onedev.server.model.Project;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@SuppressWarnings("serial")@@ -52,8 +53,8 @@ abstract class ForkOptionPanel extends Panel {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);Project projectWithSameName = projectManager.find(project.getName());if (projectWithSameName != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another project");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another project");target.add(form);} else {projectManager.fork(getProject(), project);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.javaindex 0f203ca920..fc2cfb8777 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java@@ -14,7 +14,10 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentityAware;+import io.onedev.server.util.scriptidentity.SiteAdministrator;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabLink;@@ -30,7 +33,7 @@ import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowChangeAlertPanel;@SuppressWarnings("serial")-public abstract class ProjectIssuesPage extends ProjectPage {+public abstract class ProjectIssuesPage extends ProjectPage implements ScriptIdentityAware {public ProjectIssuesPage(PageParameters params) {super(params);@@ -111,6 +114,11 @@ public abstract class ProjectIssuesPage extends ProjectPage {}+ @Override+ public ScriptIdentity getScriptIdentity() {+ return new SiteAdministrator();+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex 6beda9ed2e..f93341d38c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -25,11 +25,11 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.Input;import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.issue.IssueStateLabel;@@ -80,7 +80,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {for (String fieldName: displayFields) {if (!fieldName.equals(IssueConstants.FIELD_STATE)) {Input field = getIssue().getFieldInputs().get(fieldName);- if (field != null && !field.getType().equals(InputSpec.USER) && !field.getValues().isEmpty()) {+ if (field != null && !field.getType().equals(FieldSpec.USER) && !field.getValues().isEmpty()) {fieldsView.add(new FieldValuesPanel(fieldsView.newChildId()) {@Override@@ -103,7 +103,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {RepeatingView avatarsView = new RepeatingView("avatars");for (String fieldName: displayFields) {Input field = getIssue().getFieldInputs().get(fieldName);- if (field != null && field.getType().equals(InputSpec.USER) && !field.getValues().isEmpty()) {+ if (field != null && field.getType().equals(FieldSpec.USER) && !field.getValues().isEmpty()) {User user = OneDev.getInstance(UserManager.class).findByName(field.getValues().iterator().next());if (user != null) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 8eb189c1d4..b03f50aad3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -39,12 +39,16 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.model.support.issue.IssueSetting;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.issue.TransitionSpec;+import io.onedev.server.model.support.issue.fieldspec.ChoiceField;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;-import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.search.entity.issue.ChoiceFieldCriteria;import io.onedev.server.search.entity.issue.FieldOperatorCriteria;import io.onedev.server.search.entity.issue.IssueCriteria;@@ -54,13 +58,9 @@ import io.onedev.server.search.entity.issue.MilestoneCriteria;import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.util.EditContext;import io.onedev.server.util.IssueConstants;-import io.onedev.server.util.OneContext;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;@@ -166,7 +166,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {}}} else if (SecurityUtils.canWriteCode(issue.getProject().getFacade())) {- InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);UserMatcher userMatcher = UserMatcher.fromString(fieldSpec.getCanBeChangedBy());if (fieldSpec != null && userMatcher.matches(getProject(), SecurityUtils.getUser())) {issue = SerializationUtils.clone(issue);@@ -229,21 +229,21 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (stateSpec != null)color = stateSpec.getColor();} else {- InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);- if (fieldSpec instanceof ChoiceInput) {- ChoiceProvider choiceProvider = ((ChoiceInput)fieldSpec).getChoiceProvider();- OneContext.push(new OneContext(this));+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);+ if (fieldSpec instanceof ChoiceField) {+ ChoiceProvider choiceProvider = ((ChoiceField)fieldSpec).getChoiceProvider();+ ComponentContext.push(new ComponentContext(this));try {color = choiceProvider.getChoices(true).get(getColumn());} finally {- OneContext.pop();+ ComponentContext.pop();}- } else if (fieldSpec instanceof UserChoiceInput) {+ } else if (fieldSpec instanceof UserChoiceField) {user = OneDev.getInstance(UserManager.class).findByName(getColumn());}}} else {- InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);if (fieldSpec != null)title = "<i>" + HtmlEscape.escapeHtml5(fieldSpec.getNameOfEmptyValue()) + "</i>";else@@ -360,7 +360,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {boolean hasPromptFields = false;PressButtonTrigger trigger = (PressButtonTrigger) transitionRef.get().getTrigger();for (String promptField: trigger.getPromptFields()) {- InputSpec fieldSpec = getIssueSetting().getFieldSpec(promptField);+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(promptField);if (fieldSpec != null && UserMatcher.fromString(fieldSpec.getCanBeChangedBy()).matches(getProject(), SecurityUtils.getUser())) {hasPromptFields = true;break;@@ -408,7 +408,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (!SecurityUtils.canWriteCode(issue.getProject().getFacade()))throw new UnauthorizedException("Permission denied");- InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);if (fieldSpec == null)throw new OneException("Undefined custom field: " + fieldName);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 32c2d61522..6893a48c4f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -27,11 +27,11 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.search.entity.build.FixedIssueCriteria;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.component.build.list.BuildListPanel;@@ -271,11 +271,6 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputContethrow new UnsupportedOperationException();}- @Override- public void validateName(String inputName) {- throw new UnsupportedOperationException();- }-@Overridepublic InputSpec getInputSpec(String inputName) {return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(inputName);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.javaindex a289eddaee..450740356f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java@@ -14,7 +14,8 @@ import io.onedev.server.model.Milestone;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;@SuppressWarnings("serial")abstract class MilestoneEditPanel extends Panel {@@ -44,10 +45,10 @@ abstract class MilestoneEditPanel extends Panel {MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);Milestone milestoneWithSameName = milestoneManager.find(milestone.getProject(), milestone.getName());if (milestoneWithSameName != null && !milestoneWithSameName.equals(milestone)) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another milestone in the project");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another milestone in the project");}- if (!editor.hasErrors(true)){+ if (editor.isValid()){Milestone reloaded = getMilestone();editor.getDescriptor().copyProperties(milestone, reloaded);milestoneManager.save(reloaded);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.javaindex 63d6b91198..d0e07a3459 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java@@ -17,7 +17,8 @@ import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;@SuppressWarnings("serial")abstract class NewBoardPanel extends Panel {@@ -45,10 +46,10 @@ abstract class NewBoardPanel extends Panel {super.onSubmit(target, form);int indexWithSameName = BoardSpec.getBoardIndex(boards, board.getName());if (indexWithSameName != -1) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another issue board in the project");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another issue board in the project");}- if (!editor.hasErrors(true)){+ if (editor.isValid()){board.getColumns().clear();for (String column: board.getEditColumns())board.getColumns().add(column.equals(BoardSpec.NULL_COLUMN)?null:column);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.javaindex 1ce620a00c..f74614303c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java@@ -15,7 +15,8 @@ import io.onedev.server.model.Project;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;@SuppressWarnings("serial")abstract class NewMilestonePanel extends Panel {@@ -43,10 +44,10 @@ abstract class NewMilestonePanel extends Panel {MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);Milestone milestoneWithSameName = milestoneManager.find(getProject(), milestone.getName());if (milestoneWithSameName != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another milestone in the project");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another milestone in the project");}- if (!editor.hasErrors(true)){+ if (editor.isValid()){milestone.setProject(getProject());milestoneManager.save(milestone);Session.get().success("New milestone created");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.javaindex 6469872729..e699496027 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java@@ -15,12 +15,12 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;@@ -57,7 +57,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {super.onSubmit(target, form);getIssue().removeFields(getTransition().getRemoveFields());- Map<String, Object> fieldValues = IssueUtils.getFieldValues(editor.getOneContext(), fieldBean, trigger.getPromptFields());+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(editor.newComponentContext(), fieldBean, trigger.getPromptFields());OneDev.getInstance(IssueChangeManager.class).changeState(getIssue(), getTransition().getToState(), fieldValues, null, SecurityUtils.getUser());onSaved(target);}@@ -100,11 +100,6 @@ abstract class StateTransitionPanel extends Panel implements InputContext {return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(inputName);}- @Override- public void validateName(String inputName) {- throw new UnsupportedOperationException();- }-protected abstract Issue getIssue();protected abstract void onSaved(AjaxRequestTarget target);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.javaindex 5919f7c230..9885dbc5e9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java@@ -15,11 +15,14 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentityAware;+import io.onedev.server.util.scriptidentity.SiteAdministrator;import io.onedev.server.web.component.issue.create.NewIssueEditor;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;@@ -27,7 +30,7 @@ import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowChangeAlimport io.onedev.server.web.page.security.LoginPage;@SuppressWarnings("serial")-public class NewIssuePage extends ProjectPage implements InputContext {+public class NewIssuePage extends ProjectPage implements InputContext, ScriptIdentityAware {private static final String PARAM_QUERY = "query";@@ -119,8 +122,8 @@ public class NewIssuePage extends ProjectPage implements InputContext {}@Override- public void validateName(String inputName) {- throw new UnsupportedOperationException();+ public ScriptIdentity getScriptIdentity() {+ return new SiteAdministrator();}public static PageParameters paramsOf(Project project, String query) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex e1a75c7461..0a0fdd81b6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -30,9 +30,12 @@ import io.onedev.server.cache.UserInfoManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.scriptidentity.ScriptIdentityAware;+import io.onedev.server.util.scriptidentity.SiteAdministrator;import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;@@ -53,7 +56,7 @@ import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QueryPositionSupport;@SuppressWarnings("serial")-public abstract class IssueDetailPage extends ProjectPage implements InputContext {+public abstract class IssueDetailPage extends ProjectPage implements InputContext, ScriptIdentityAware {public static final String PARAM_ISSUE = "issue";@@ -277,15 +280,15 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex}@Override- public InputSpec getInputSpec(String inputName) {+ public FieldSpec getInputSpec(String inputName) {return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(inputName);}@Override- public void validateName(String inputName) {- throw new UnsupportedOperationException();+ public ScriptIdentity getScriptIdentity() {+ return new SiteAdministrator();}-+private class IssueTab extends PageTab {public IssueTab(String title, Class<? extends Page> pageClass) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.javaindex 3b425a2ea5..3db4a95bce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java@@ -9,8 +9,8 @@ import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Milestone;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.StateSpec;-import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.web.component.milestone.progress.MilestoneProgressBar;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneCloseOption.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneCloseOption.javaindex f83d42e82b..9eceefcad9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneCloseOption.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneCloseOption.java@@ -7,7 +7,7 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.model.Milestone;-import io.onedev.server.util.OneContext;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -59,14 +59,14 @@ public class MilestoneCloseOption implements Serializable {@SuppressWarnings("unused")private static boolean isNewMilestoneVisible() {- return (Boolean) OneContext.get().getEditContext().getInputValue("moveOpenIssuesToAnotherMilestone");+ return (Boolean) EditContext.get().getInputValue("moveOpenIssuesToAnotherMilestone");}@SuppressWarnings("unused")private static List<String> getNewMilestoneChoices() {List<String> choices = new ArrayList<>();ProjectPage page = (ProjectPage) WicketUtils.getPage();- Object milestoneToDelete = OneContext.get().getEditContext().getInputValue("milestoneToClose");+ Object milestoneToDelete = EditContext.get().getInputValue("milestoneToClose");for (Milestone milestone: page.getProject().getMilestones()) {if (!milestone.isClosed() && !milestone.getName().equals(milestoneToDelete))choices.add(milestone.getName());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDeleteOption.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDeleteOption.javaindex 02c624ee2d..9a534e6512 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDeleteOption.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDeleteOption.java@@ -7,7 +7,7 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.model.Milestone;-import io.onedev.server.util.OneContext;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -59,14 +59,14 @@ public class MilestoneDeleteOption implements Serializable {@SuppressWarnings("unused")private static boolean isNewMilestoneVisible() {- return (Boolean) OneContext.get().getEditContext().getInputValue("moveIssuesToAnotherMilestone");+ return (Boolean) EditContext.get().getInputValue("moveIssuesToAnotherMilestone");}@SuppressWarnings("unused")private static List<String> getNewMilestoneChoices() {List<String> choices = new ArrayList<>();ProjectPage page = (ProjectPage) WicketUtils.getPage();- Object milestoneToDelete = OneContext.get().getEditContext().getInputValue("milestoneToDelete");+ Object milestoneToDelete = EditContext.get().getInputValue("milestoneToDelete");for (Milestone milestone: page.getProject().getMilestones()) {if (!milestone.getName().equals(milestoneToDelete))choices.add(milestone.getName());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.javaindex 94de2078ab..48a22fb29f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java@@ -14,7 +14,8 @@ import io.onedev.server.model.Milestone;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.page.project.issues.ProjectIssuesPage;@SuppressWarnings("serial")@@ -53,10 +54,10 @@ public class MilestoneEditPage extends ProjectIssuesPage {MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);Milestone milestoneWithSameName = milestoneManager.find(getProject(), milestone.getName());if (milestoneWithSameName != null && !milestoneWithSameName.equals(milestone)) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another milestone in the project");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another milestone in the project");}- if (!editor.hasErrors(true)){+ if (editor.isValid()){editor.getDescriptor().copyProperties(milestone, milestoneModel.getObject());milestoneManager.save(milestoneModel.getObject());Session.get().success("Milestone saved");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.javaindex e612137fa6..9c0a101181 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java@@ -13,7 +13,8 @@ import io.onedev.server.model.Project;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.ProjectIssuesPage;@@ -40,10 +41,10 @@ public class NewMilestonePage extends ProjectIssuesPage {MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);Milestone milestoneWithSameName = milestoneManager.find(getProject(), milestone.getName());if (milestoneWithSameName != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another milestone in the project");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another milestone in the project");}- if (!editor.hasErrors(true)){+ if (editor.isValid()){milestone.setProject(getProject());milestoneManager.save(milestone);Session.get().success("New milestone created");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java b/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.javaindex 9bfc1119e0..04b7b6ba12 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java@@ -10,8 +10,8 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -56,14 +56,14 @@ public class UndefinedFieldResolution implements Serializable {@SuppressWarnings("unused")private static boolean isNewFieldVisible() {- return OneContext.get().getEditContext().getInputValue("fixType") == FixType.CHANGE_TO_ANOTHER_FIELD;+ return EditContext.get().getInputValue("fixType") == FixType.CHANGE_TO_ANOTHER_FIELD;}@SuppressWarnings("unused")private static List<String> getFieldChoices() {ProjectPage page = (ProjectPage) WicketUtils.getPage();List<String> fields = new ArrayList<>();- for (InputSpec field: OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs())+ for (FieldSpec field: OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs())fields.add(field.getName());return fields;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java b/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.javaindex 6989dc697a..4b523328e6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java@@ -12,20 +12,16 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.Project;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.fieldspec.ChoiceField;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.ShowCondition;-import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowReconcilePanel.UndefinedFieldValueContainer;-import io.onedev.server.web.util.WicketUtils;@Editablepublic class UndefinedFieldValueResolution implements Serializable {@@ -64,45 +60,20 @@ public class UndefinedFieldValueResolution implements Serializable {@SuppressWarnings("unused")private static boolean isNewValueVisible() {- return OneContext.get().getEditContext().getInputValue("fixType") == FixType.CHANGE_TO_ANOTHER_VALUE;+ return EditContext.get().getInputValue("fixType") == FixType.CHANGE_TO_ANOTHER_VALUE;}@SuppressWarnings("unused")private static List<String> getValueChoices() {- UndefinedFieldValueContainer container = OneContext.get().getComponent()+ UndefinedFieldValueContainer container = ComponentContext.get().getComponent().findParent(UndefinedFieldValueContainer.class);GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- InputSpec fieldSpec = Preconditions.checkNotNull(issueSetting.getFieldSpec(container.getFieldName()));- OneContext.push(new OneContext(container) {-- @Override- public Project getProject() {- ProjectPage page = (ProjectPage) WicketUtils.getPage();- return page.getProject();- }-- @Override- public EditContext getEditContext(int level) {- return new EditContext() {-- @Override- public Object getInputValue(String name) {- return null;- }-- };- }-- @Override- public InputContext getInputContext() {- throw new UnsupportedOperationException();- }-- });+ FieldSpec fieldSpec = Preconditions.checkNotNull(issueSetting.getFieldSpec(container.getFieldName()));+ ComponentContext.push(new ComponentContext(container));try {- return new ArrayList<>(((ChoiceInput)fieldSpec).getChoiceProvider().getChoices(true).keySet());+ return new ArrayList<>(((ChoiceField)fieldSpec).getChoiceProvider().getChoices(true).keySet());} finally {- OneContext.pop();+ ComponentContext.pop();}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.java b/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.javaindex dc6adbed5e..ecdb6e5d0d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.java@@ -8,7 +8,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.javaindex 9edccbf115..bab47546f5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java@@ -25,7 +25,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.ajaxlistener.ChangeTextListener;import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.htmlindex ffcc780271..9c6039fe96 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html@@ -38,7 +38,6 @@<wicket:fragment wicket:id="sameBranchFrag"><div class="alert alert-warning"><div class="summary">- <span class="fa fa-lg fa-warning"></span><span>Please select different branches to merge.</span></div></div>@@ -55,7 +54,6 @@<wicket:fragment wicket:id="unrelatedHistoryFrag"><div class="alert alert-danger"><div class="summary">- <span class="fa fa-lg fa-warning"></span><span>History of target branch and source branch is unrelated.</span></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.javaindex 7a592b7841..9e9e307c73 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java@@ -5,7 +5,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.support.build.BuildSetting;+import io.onedev.server.model.support.BuildSetting;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.setting.ProjectSettingPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.javaindex c920d86ceb..a6333264cf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java@@ -17,7 +17,8 @@ import io.onedev.server.model.Project;import io.onedev.server.web.component.project.ConfirmDeleteProjectModal;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@@ -72,7 +73,7 @@ public class GeneralSettingPage extends ProjectSettingPage {Project projectWithSameName = projectManager.find(project.getName());if (projectWithSameName != null && !projectWithSameName.equals(project)) {String errorMessage = "This name has already been used by another project";- editor.getErrorContext(new PathElement.Named("name")).addError(errorMessage);+ editor.error(new Path(new PathNode.Named("name")), errorMessage);} else {projectManager.save(project, oldName);Session.get().success("General setting has been updated");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.javaindex 2ce0301f2d..198c7d3eaa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java@@ -13,8 +13,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.IssueSetting;-import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabLink;import io.onedev.server.web.component.tabbable.Tab;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.cssindex a5c12c7bfd..82ca8d5d67 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css@@ -81,4 +81,8 @@ body.BranchProtectionPage, body.WebHooksPage {}#project-setting .commit-message-transforms th {font-weight: normal;+}++body.SecretListPage .help-block {+ margin: 0 0 16px 0;}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.htmlindex 0d64be3e88..2736fc4cbb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.html@@ -1,6 +1,7 @@<wicket:extend>+ <div class="page-title">Secrets</div>+ <div wicket:id="note" class="help-block"></div><form wicket:id="form" class="leave-confirm secrets">- <div wicket:id="note" class="alert alert-warning"></div><div wicket:id="feedback"></div><div wicket:id="editor"></div><div class="actions">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.javaindex 68912bcfdc..0caaf244fa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.java@@ -2,8 +2,6 @@ package io.onedev.server.web.page.project.setting.secret;import java.io.Serializable;-import javax.validation.ValidationException;-import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;@@ -12,8 +10,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.support.Secret;-import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@@ -34,22 +31,13 @@ public class SecretListPage extends ProjectSettingPage {protected void onSubmit() {super.onSubmit();- try {- Secret.validateSecrets(getProject().getSecrets());- OneDev.getInstance(ProjectManager.class).save(getProject());- getSession().success("Project secrets have been saved");- setResponsePage(SecretListPage.class, SecretListPage.paramsOf(getProject()));- } catch (ValidationException e) {- error(e.getMessage());- }+ OneDev.getInstance(ProjectManager.class).save(getProject());+ getSession().success("Project secrets have been saved");+ setResponsePage(SecretListPage.class, SecretListPage.paramsOf(getProject()));}};- String note = String.format("Define project secrets here to be used in places such as CI job. <b>Please note</b> "- + "that secret value less than %d characters will not be masked in build log", SecretInput.MASK.length());- form.add(new Label("note", note).setEscapeModelStrings(false));-form.add(new FencedFeedbackPanel("feedback", form));form.add(PropertyContext.editModel("editor", new AbstractReadOnlyModel<Serializable>() {@@ -62,6 +50,11 @@ public class SecretListPage extends ProjectSettingPage {}, "secrets"));add(form);++ String note = String.format("Define project secrets here to be used in CI jobs. Secret value less "+ + "than %d characters will not be masked in build log. For a given name, the first "+ + "authorized secret will be used", SecretInput.MASK.length());+ add(new Label("note", note).setEscapeModelStrings(false));}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.javaindex 18c2dae61b..d7418a31c2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java@@ -16,7 +16,8 @@ import io.onedev.server.model.User;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathNode;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.my.MyAvatarPage;import io.onedev.server.web.page.project.ProjectListPage;@@ -49,15 +50,15 @@ public class RegisterPage extends BasePage {UserManager userManager = OneDev.getInstance(UserManager.class);User userWithSameName = userManager.findByName(user.getName());if (userWithSameName != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another user.");+ editor.error(new Path(new PathNode.Named("name")),+ "This name has already been used by another user.");}User userWithSameEmail = userManager.findByEmail(user.getEmail());if (userWithSameEmail != null) {- editor.getErrorContext(new PathElement.Named("email"))- .addError("This email has already been used by another user.");+ editor.error(new Path(new PathNode.Named("email")),+ "This email has already been used by another user.");}- if (!editor.hasErrors(true)) {+ if (editor.isValid()) {user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(user.getPassword()));userManager.save(user, null);Session.get().success("New user registered");diff --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 8687da1e93..2f93094382 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,12 +1,9 @@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 48f602a81a..a97d7c7e91 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@@ -10,6 +10,8 @@ import java.util.Map;import java.util.Set;import java.util.concurrent.Callable;+import org.eclipse.jgit.lib.ObjectId;+import com.google.common.base.Preconditions;import com.google.common.collect.Lists;@@ -22,11 +24,16 @@ import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;import io.onedev.server.cache.CacheManager;import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobVariable;+import io.onedev.server.ci.job.VariableInterpolator;+import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Build;@@ -35,10 +42,13 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.model.support.Secret;+import io.onedev.server.model.support.administration.groovyscript.GroovyScript;import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.scriptidentity.ScriptIdentity;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;public class SuggestionUtils {@@ -80,6 +90,50 @@ public class SuggestionUtils {return suggestions;}+ public static List<InputSuggestion> suggestVariables(Project project, ObjectId commitId,+ Job job, String matchWith) {+ matchWith = matchWith.toLowerCase();+ int numSuggestions = 0;+ List<InputSuggestion> suggestions = new ArrayList<>();++ Map<String, String> variables = new LinkedHashMap<>();+ for (JobVariable var: JobVariable.values())+ variables.put(var.name().toLowerCase(), null);+ for (ParamSpec paramSpec: job.getParamSpecs())+ variables.put(VariableInterpolator.PARAMS_PREFIX + paramSpec.getName(), paramSpec.getDescription());+ for (Secret secret: project.getSecrets()) {+ String varName = VariableInterpolator.SECRETS_PREFIX + secret.getName();+ if (!variables.containsKey(varName) && secret.isAuthorized(project, commitId))+ variables.put(varName, null);+ }+ for (GroovyScript script: OneDev.getInstance(SettingManager.class).getGroovyScripts()) {+ String varName = VariableInterpolator.SCRIPTS_PREFIX + script.getName();+ if (!variables.containsKey(varName) && script.isAuthorized(ScriptIdentity.get()))+ variables.put(varName, null);+ }+ for (Map.Entry<String, String> entry: variables.entrySet()) {+ int index = entry.getKey().toLowerCase().indexOf(matchWith);+ if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {+ suggestions.add(new InputSuggestion(entry.getKey(), entry.getValue(),+ new LinearRange(index, index+matchWith.length())));+ }+ }+ return suggestions;+ }++ public static List<InputSuggestion> suggestSecrets(Project project, String matchWith) {+ matchWith = matchWith.toLowerCase();+ int numSuggestions = 0;+ List<InputSuggestion> suggestions = new ArrayList<>();++ for (Secret secret: project.getSecrets()) {+ int index = secret.getName().toLowerCase().indexOf(matchWith);+ if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS)+ suggestions.add(new InputSuggestion(secret.getName(), new LinearRange(index, index+matchWith.length())));+ }+ return suggestions;+ }+public static List<InputSuggestion> suggestTags(Project project, String matchWith) {matchWith = matchWith.toLowerCase();int numSuggestions = 0;diff --git a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.javanew file mode 100644index 0000000000..5f19c069a7--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java@@ -0,0 +1,39 @@+package io.onedev.server.util.patternset;++import static org.junit.Assert.*;++import java.util.function.Function;++import org.junit.Test;++import com.google.common.collect.Sets;++import io.onedev.server.util.interpolative.Interpolative;++public class InterpolativePatternSetGrammarTest {++ @Test+ public void test() {+ Function<String, String> interpolator = new Function<String, String>() {++ @Override+ public String apply(String t) {+ return t;+ }++ };++ PatternSet expected = new PatternSet(Sets.newHashSet("hello world"), Sets.newHashSet());+ String interpolated = Interpolative.fromString("@\"@hello world\"").interpolateWith(interpolator);+ PatternSet actual = PatternSet.fromString(interpolated);+ assertEquals(expected.getIncludes(), actual.getIncludes());+ assertEquals(expected.getExcludes(), actual.getExcludes());++ expected = new PatternSet(Sets.newHashSet("@robin", "-@alive"), Sets.newHashSet("\"@"));+ interpolated = Interpolative.fromString("\\@robin \"-\\@alive\" -\\\"\\@").interpolateWith(interpolator);+ actual = PatternSet.fromString(interpolated);+ assertEquals(expected.getIncludes(), actual.getIncludes());+ assertEquals(expected.getExcludes(), actual.getExcludes());+ }++}diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.javaindex 12b94c414c..96ec53d9ce 100644--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java@@ -51,10 +51,10 @@ import io.onedev.server.ci.job.JobContext;import io.onedev.server.ci.job.JobManager;import io.onedev.server.ci.job.JobService;import io.onedev.server.ci.job.SubmoduleCredential;-import io.onedev.server.ci.job.Variable;+import io.onedev.server.ci.job.EnvVar;import io.onedev.server.git.config.GitConfig;import io.onedev.server.model.support.RegistryLogin;-import io.onedev.server.model.support.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.plugin.docker.DockerExecutor.TestData;import io.onedev.server.util.JobLogger;import io.onedev.server.util.PKCS12CertExtractor;@@ -340,7 +340,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, Vdocker.clearArgs();docker.addArgs("run", "-d", "--name=" + containerName, "--network=" + network,"--network-alias=" + jobService.getName());- for (Variable var: jobService.getEnvVars())+ for (EnvVar var: jobService.getEnvVars())docker.addArgs("--env", var.getName() + "=" + var.getValue());docker.addArgs(jobService.getImage());if (jobService.getArguments() != null) {@@ -811,8 +811,6 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, VString containerName = network + "-job";docker.clearArgs();docker.addArgs("run", "--name=" + containerName, "--network=" + network);- for (Map.Entry<String, String> entry: jobContext.getEnvVars().entrySet())- docker.addArgs("--env", entry.getKey() + "=" + entry.getValue());if (getRunOptions() != null)docker.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.javaindex 779f5042d9..be0395d19f 100644--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java@@ -9,7 +9,7 @@ import io.onedev.commons.launcher.loader.ImplementationProvider;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.server.ci.job.JobExecutorDiscoverer;-import io.onedev.server.model.support.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.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 e32dfd8854..4d2df0fdbf 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@@ -45,19 +45,19 @@ import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.ci.job.CacheSpec;+import io.onedev.server.ci.job.EnvVar;import io.onedev.server.ci.job.JobContext;import io.onedev.server.ci.job.JobService;-import io.onedev.server.ci.job.Variable;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.RegistryLogin;-import io.onedev.server.model.support.jobexecutor.JobExecutor;-import io.onedev.server.model.support.jobexecutor.NodeSelectorEntry;-import io.onedev.server.model.support.jobexecutor.ServiceLocator;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.NodeSelectorEntry;+import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;+import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.plugin.executor.kubernetes.KubernetesExecutor.TestData;import io.onedev.server.util.JobLogger;import io.onedev.server.util.PKCS12CertExtractor;import io.onedev.server.util.ServerConfig;-import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.util.validation.annotation.DnsName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;@@ -481,7 +481,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData"cpu", jobService.getCpuRequirement(),"memory", jobService.getMemoryRequirement())));List<Map<Object, Object>> envs = new ArrayList<>();- for (Variable envVar: jobService.getEnvVars()) {+ for (EnvVar envVar: jobService.getEnvVars()) {envs.add(Maps.newLinkedHashMap("name", envVar.getName(),"value", envVar.getValue()));@@ -722,16 +722,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataenvs.add(Maps.newLinkedHashMap("name", KubernetesHelper.ENV_JOB_TOKEN,"value", jobToken));- if (jobContext != null) {- for (Map.Entry<String, String> entry: jobContext.getEnvVars().entrySet()) {- envs.add(Maps.newLinkedHashMap(- "name", entry.getKey(),- "value", entry.getValue()));- }- }-- mainContainerSpec.put("env", envs);-+List<String> sidecarArgs = Lists.newArrayList("-classpath", k8sHelperClassPath,"io.onedev.k8shelper.SideCar");diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.javaindex f6380963d5..45969ae6db 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java@@ -11,7 +11,7 @@ import io.onedev.commons.launcher.loader.ImplementationProvider;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.server.ci.job.JobExecutorDiscoverer;-import io.onedev.server.model.support.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.rest.jersey.JerseyConfigurator;/**diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.javaindex f3cf7212de..b551d33817 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java@@ -4,17 +4,21 @@ import java.io.File;import java.io.IOException;import java.util.HashMap;import java.util.LinkedHashMap;+import java.util.List;import java.util.concurrent.Callable;import org.apache.commons.lang3.SerializationUtils;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;+import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobReport;import io.onedev.server.model.Build;import io.onedev.server.util.JobLogger;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;@Editable(name="Html Report")public class JobHtmlReport extends JobReport {@@ -29,7 +33,8 @@ public class JobHtmlReport extends JobReport {private String startPage;- @Editable(order=1000)+ @Editable(order=1000, description="Specify report name. <b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getReportName() {return reportName;@@ -38,8 +43,10 @@ public class JobHtmlReport extends JobReport {public void setReportName(String reportName) {this.reportName = reportName;}-- @Editable(order=1100, description="Specify start page of the report relative to workspace, for instance: api/index.html")++ @Editable(order=1100, description="Specify start page of the report relative to workspace, for instance: api/index.html. "+ + "<b>Note:</b> Type '@' to start inserting variable")+ @Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getStartPage() {return startPage;@@ -49,6 +56,11 @@ public class JobHtmlReport extends JobReport {this.startPage = startPage;}+ @SuppressWarnings("unused")+ private List<InputSuggestion> suggestVariables(String matchWith) {+ return Job.suggestVariables(matchWith);+ }+@Overridepublic void process(Build build, File workspace, JobLogger logger) {File reportDir = build.getReportDir(DIR);@@ -85,4 +97,5 @@ public class JobHtmlReport extends JobReport {});}+}