The Unified and Autonomous Development Platform
Various improvements and bug fixes while writing documents
Robin Shen8910164c2f41
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex 03984d5a2b..e81eee07fd 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -237,10 +237,10 @@ public class OneDev extends AbstractPlugin implements Serializable {}}- if (serverConfig.getHttpPort() != 0)- serverUrl = "http://" + ipRef.get() + ":" + serverConfig.getHttpPort();- else+ if (serverConfig.getHttpsPort() != 0)serverUrl = "https://" + ipRef.get() + ":" + serverConfig.getHttpsPort();+ else+ serverUrl = "http://" + ipRef.get() + ":" + serverConfig.getHttpPort();}return serverUrl;@@ -248,14 +248,14 @@ public class OneDev extends AbstractPlugin implements Serializable {private String buildServerUrl(String host, @Nullable String httpPort, @Nullable String httpsPort) {String serverUrl = null;- if (httpPort != null) {- serverUrl = "http://" + host;- if (!httpPort.equals("80"))- serverUrl += ":" + httpPort;- } else if (httpsPort != null) {+ if (httpsPort != null) {serverUrl = "https://" + host;if (!httpsPort.equals("443"))serverUrl += ":" + httpsPort;+ } else if (httpPort != null) {+ serverUrl = "http://" + host;+ if (!httpPort.equals("80"))+ serverUrl += ":" + httpPort;} else {logger.warn("This OneDev deployment looks odd to me: "+ "both http and https port are not specified");diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex 9eb23bec4e..180071c042 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -20,6 +20,7 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.ExecutionException;import java.util.concurrent.ExecutorService;import java.util.concurrent.TimeoutException;+import java.util.concurrent.atomic.AtomicReference;import java.util.concurrent.locks.Lock;import java.util.function.Consumer;@@ -68,6 +69,7 @@ import io.onedev.server.event.Event;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.build.BuildFinished;import io.onedev.server.event.build.BuildPending;+import io.onedev.server.event.build.BuildRetrying;import io.onedev.server.event.build.BuildRunning;import io.onedev.server.event.build.BuildSubmitted;import io.onedev.server.event.entity.EntityPersisted;@@ -89,7 +91,7 @@ import io.onedev.server.security.CodePullAuthorizationSource;import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.util.BuildCommitAware;+import io.onedev.server.util.CommitAware;import io.onedev.server.util.JobLogger;import io.onedev.server.util.MatrixRunner;import io.onedev.server.util.SecurityUtils;@@ -309,9 +311,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}@Nullable- private JobExecutor getJobExecutor(Project project, ObjectId commitId, String jobName, String image) {+ private JobExecutor getJobExecutor(Build build) {for (JobExecutor executor: jobExecutors) {- if (executor.isApplicable(project, commitId, jobName, image))+ if (executor.isApplicable(build))return executor;}return null;@@ -338,17 +340,18 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizInterpolated.pop();}- ObjectId commitId = ObjectId.fromString(build.getCommitHash());- JobExecutor executor = getJobExecutor(build.getProject(), commitId, job.getName(), job.getImage());+ JobExecutor executor = getJobExecutor(build);if (executor != null) {JobLogger jobLogger = logManager.getLogger(build, jobSecretsToMask);+ ObjectId commitId = ObjectId.fromString(build.getCommitHash());Long buildId = build.getId();Long buildNumber = build.getNumber();String projectName = build.getProject().getName();File projectGitDir = build.getProject().getGitDir();- JobExecution execution = new JobExecution(executorService.submit(new Runnable() {+ AtomicReference<JobExecution> executionRef = new AtomicReference<>(null);+ executionRef.set(new JobExecution(executorService.submit(new Runnable() {@Overridepublic void run() {@@ -373,12 +376,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}if (job.getArtifacts() != null) {- PatternSet patternSet = PatternSet.fromString(job.getArtifacts());+ PatternSet patternSet = PatternSet.parse(job.getArtifacts());includeFiles.addAll(patternSet.getIncludes());excludeFiles.addAll(patternSet.getExcludes());}for (JobReport report: job.getReports()) {- PatternSet patternSet = PatternSet.fromString(report.getFilePatterns());+ PatternSet patternSet = PatternSet.parse(report.getFilePatterns());includeFiles.addAll(patternSet.getIncludes());excludeFiles.addAll(patternSet.getExcludes());}@@ -398,34 +401,34 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz});- JobContext jobContext = new JobContext(projectName, buildNumber, projectGitDir, job.getImage(),- serverWorkspace, job.getCommands(), job.isRetrieveSource(), job.getCloneDepth(),- job.getSubmoduleCredentials(), job.getCpuRequirement(), job.getMemoryRequirement(),- commitId, job.getCaches(), new PatternSet(includeFiles, excludeFiles),- executor.getCacheTTL(), job.getServices(), jobLogger) {+ int retried = 0;+ while (true) {+ JobContext jobContext = new JobContext(projectName, buildNumber, projectGitDir, job.getImage(),+ serverWorkspace, job.getCommands(), job.isRetrieveSource(), job.getCloneDepth(),+ job.getSubmoduleCredentials(), job.getCpuRequirement(), job.getMemoryRequirement(),+ commitId, job.getCaches(), new PatternSet(includeFiles, excludeFiles),+ executor.getCacheTTL(), retried, job.getServices(), jobLogger) {- @Override- public void notifyJobRunning() {- transactionManager.run(new Runnable() {+ @Override+ public void notifyJobRunning() {+ transactionManager.run(new Runnable() {- @Override- public void run() {- Build build = buildManager.load(buildId);- build.setStatus(Build.Status.RUNNING);- build.setRunningDate(new Date());- buildManager.save(build);- listenerRegistry.post(new BuildRunning(build));- }-- });- }+ @Override+ public void run() {+ Build build = buildManager.load(buildId);+ build.setStatus(Build.Status.RUNNING);+ build.setRunningDate(new Date());+ buildManager.save(build);+ listenerRegistry.post(new BuildRunning(build));+ }++ });+ }- };-- jobContexts.put(jobToken, jobContext);-- int retried = 0;- while (true) {+ };++ jobContexts.put(jobToken, jobContext);+try {executor.execute(jobToken, jobContext);break;@@ -438,18 +441,33 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic Boolean call() {Build build = buildManager.load(buildId);- if (e.getMessage() != null)+ if (e instanceof OneException)build.setErrorMessage(e.getMessage());elsebuild.setErrorMessage(Throwables.getStackTraceAsString(e));buildManager.save(build);RetryCondition retryCondition = RetryCondition.parse(job, job.getRetryCondition());- return retryCondition.test(build);+ return retryCondition.matches(build);}})) {log(e, jobLogger);jobLogger.log("Job will be retried after a while...");+ transactionManager.run(new Runnable() {++ @Override+ public void run() {+ Build build = buildManager.load(buildId);+ build.setErrorMessage(null);+ build.setRunningDate(null);+ build.setPendingDate(null);+ build.setRetryDate(new Date());+ build.setStatus(Build.Status.WAITING);+ listenerRegistry.post(new BuildRetrying(build));+ buildManager.save(build);+ }++ });try {Thread.sleep(job.getRetryDelay() * (long)(Math.pow(2, retried)) * 1000L);} catch (InterruptedException e2) {@@ -459,9 +477,13 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic void run() {+ JobExecution execution = executionRef.get();+ if (execution != null)+ execution.updateBeginTime();Build build = buildManager.load(buildId);- build.setErrorMessage(null);- build.setRetryDate(new Date());+ build.setPendingDate(new Date());+ build.setStatus(Build.Status.PENDING);+ listenerRegistry.post(new BuildPending(build));buildManager.save(build);}@@ -470,14 +492,13 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizthrow e;}}+ } finally {+ jobContexts.remove(jobToken);}}} catch (Throwable e) {- if (ExceptionUtils.find(e, InterruptedException.class) == null)- log(e, jobLogger);throw maskSecrets(e, jobSecretsToMask);} finally {- jobContexts.remove(jobToken);try {sessionManager.run(new Runnable() {@@ -497,17 +518,15 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz});FileUtils.deleteDir(serverWorkspace);} catch (Throwable e) {- if (ExceptionUtils.find(e, InterruptedException.class) == null)- log(e, jobLogger);throw maskSecrets(e, jobSecretsToMask);}jobLogger.log("Job finished");}}- }), job.getTimeout() * 1000L);+ }), job.getTimeout() * 1000L));- JobExecution prevExecution = jobExecutions.put(build.getId(), execution);+ JobExecution prevExecution = jobExecutions.put(build.getId(), executionRef.get());if (prevExecution != null)prevExecution.cancel(null);@@ -515,7 +534,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizmarkBuildError(build, "No applicable job executor");}} catch (Throwable e) {- if (e.getMessage() != null)+ if (e instanceof OneException)markBuildError(build, e.getMessage());elsemarkBuildError(build, Throwables.getStackTraceAsString(e));@@ -561,8 +580,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizpublic void on(ProjectEvent event) {Event.push(event);try {- if (event instanceof BuildCommitAware) {- ObjectId commitId = ((BuildCommitAware) event).getBuildCommit();+ if (event instanceof CommitAware) {+ ObjectId commitId = ((CommitAware) event).getCommit().getCommitId();if (!commitId.equals(ObjectId.zeroId())) {ScriptIdentity.push(new JobIdentity(event.getProject(), commitId));try {@@ -628,9 +647,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizbuild.setStatus(Build.Status.WAITING);build.setFinishDate(null);build.setPendingDate(null);+ build.setRetryDate(null);build.setRunningDate(null);build.setSubmitDate(new Date());build.setSubmitter(SecurityUtils.getUser());+ build.setCanceller(null);+ build.setCancellerName(null);buildParamManager.deleteParams(build);for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {ParamSpec paramSpec = build.getJob().getParamSpecMap().get(entry.getKey());@@ -725,7 +747,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz} else {markBuildError(build, "Stopped for unknown reason");}- } else if (build.getStatus() == Build.Status.WAITING) {+ } else if (build.getStatus() == Build.Status.WAITING && build.getRetryDate() == null) {if (build.getDependencies().stream().anyMatch(it -> it.isRequireSuccessful()&& it.getDependency().isFinished()&& it.getDependency().getStatus() != Build.Status.SUCCESSFUL)) {@@ -744,7 +766,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizMap.Entry<Long, JobExecution> entry = it.next();Build build = buildManager.get(entry.getKey());JobExecution execution = entry.getValue();- if (build == null || build.getStatus() != Build.Status.PENDING && build.getStatus() != Build.Status.RUNNING) {+ if (build == null || build.isFinished()) {it.remove();execution.cancel(null);} else if (execution.isDone()) {@@ -798,7 +820,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizBuild build = event.getBuild();try {for (PostBuildAction action: build.getJob().getPostBuildActions()) {- if (ActionCondition.parse(build.getJob(), action.getCondition()).test(build))+ if (ActionCondition.parse(build.getJob(), action.getCondition()).matches(build))action.execute(build);}} catch (Throwable e) {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex e9943da419..529fec6691 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -1,6 +1,5 @@package io.onedev.server.buildspec.job;-import static io.onedev.server.search.entity.EntityQuery.quote;import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;import static io.onedev.server.search.entity.build.BuildQueryLexer.And;import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;@@ -34,6 +33,7 @@ import io.onedev.server.event.ProjectEvent;import io.onedev.server.model.Project;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Code;@@ -150,8 +150,8 @@ public class Job implements Serializable, Validatable {}@Editable(order=120, name="Commands", description="Specify content of Linux shell script or Windows command batch to execute in above image. "- + "It will be executed under job workspace, which may contain files of your repository and other "- + "dependencies based on your configuration below. "+ + "It will be executed under <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, which may contain files of your repository and "+ + "dependency artifacts based on your configuration below. "+ "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative@Code(language = Code.SHELL, variableProvider="getVariables")@@ -198,7 +198,7 @@ public class Job implements Serializable, Validatable {}@Editable(order=9000, group="Source Retrieval", description="Whether or not to retrieve files under the repository "- + "into job workspace")+ + "into <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>")public boolean isRetrieveSource() {return retrieveSource;}@@ -268,7 +268,7 @@ 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 job workspace, and may use * or ? for pattern match. "+ + "Artifact files are relative to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, and may use * or ? for pattern match. "+ "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@Patterns(interpolative = true)@@ -348,10 +348,9 @@ public class Job implements Serializable, Validatable {this.memoryRequirement = memoryRequirement;}- @Editable(order=10100, group="More Settings", description="Cache specific paths to speed up job execution. For instance for node.js "- + "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")+ @Editable(order=10100, group="More Settings", description="Cache specific paths to speed up job execution. "+ + "For instance for node.js projects, you may cache folder <tt>/root/.npm</tt> to avoid downloading "+ + "node modules for subsequent job executions")@Validpublic List<CacheSpec> getCaches() {return caches;@@ -463,9 +462,9 @@ public class Job implements Serializable, Validatable {public static String getBuildQuery(ObjectId commitId, String jobName) {return ""- + quote(FIELD_COMMIT) + " " + getRuleName(Is) + " " + quote(commitId.name())+ + Criteria.quote(FIELD_COMMIT) + " " + getRuleName(Is) + " " + Criteria.quote(commitId.name())+ " " + getRuleName(And) + " "- + quote(FIELD_JOB) + " " + getRuleName(Is) + " " + quote(jobName);+ + Criteria.quote(FIELD_JOB) + " " + getRuleName(Is) + " " + Criteria.quote(jobName);}public static List<String> getChoices() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.javaindex 334fecf7a5..da2f01514f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java@@ -46,6 +46,8 @@ public abstract class JobContext {private final int cacheTTL;+ private final int retried;+private final JobLogger logger;private final Collection<String> allocatedCaches = new HashSet<>();@@ -56,7 +58,8 @@ public abstract class JobContext {File workspace, List<String> commands, boolean retrieveSource, Integer cloneDepth,List<SubmoduleCredential> submoduleCredentials, String cpuRequirement, StringmemoryRequirement, ObjectId commitId, Collection<CacheSpec> caches,- PatternSet collectFiles, int cacheTTL, List<JobService> services, JobLogger logger) {+ PatternSet collectFiles, int cacheTTL, int retried, List<JobService> services,+ JobLogger logger) {this.projectName = projectName;this.buildNumber = buildNumber;this.projectGitDir = projectGitDir;@@ -72,6 +75,7 @@ public abstract class JobContext {this.cacheSpecs = caches;this.collectFiles = collectFiles;this.cacheTTL = cacheTTL;+ this.retried = retried;this.services = services;this.logger = logger;}@@ -140,6 +144,10 @@ public abstract class JobContext {return cacheTTL;}+ public int getRetried() {+ return retried;+ }+public Collection<String> getAllocatedCaches() {return allocatedCaches;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.javaindex f3d7c87f5e..6ff584c35d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java@@ -69,7 +69,7 @@ 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 <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>. Leave empty to do not retrieve any artifacts. "+ "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@Patterns(interpolative = true)diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecution.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecution.javaindex 58e8069dab..44af6a2aba 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecution.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecution.java@@ -10,10 +10,10 @@ public class JobExecution {private final Future<?> future;- private final long beginTime;-private final long timeout;+ private volatile long beginTime;+private volatile Long cancellerId;public JobExecution(Future<?> future, long timeout) {@@ -35,6 +35,10 @@ public class JobExecution {return System.currentTimeMillis() - beginTime > timeout;}+ public void updateBeginTime() {+ beginTime = System.currentTimeMillis();+ }+public boolean isDone() {return future.isDone();}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.javaindex e1a411c109..0b2697f13f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java@@ -43,7 +43,7 @@ public abstract class JobReport implements Serializable {public PatternSet getPatternSet() {if (patternSet == null)- patternSet = PatternSet.fromString(getFilePatterns());+ patternSet = PatternSet.parse(getFilePatterns());return patternSet;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.javaindex cbd3478808..5f29fda394 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java@@ -99,7 +99,7 @@ public class ProjectDependency implements Serializable {return new ArrayList<>();}- @Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve into job workspace. "+ @Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve into <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>. "+ "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@Patterns(suggester="suggestArtifacts", interpolative=true)diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.javaindex 68908139d9..0f97619cd0 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java@@ -124,8 +124,8 @@ public class CreateIssueAction extends PostBuildAction {}OneDev.getInstance(IssueManager.class).open(issue);} finally {- Build.pop();ScriptIdentity.pop();+ Build.pop();}}});diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.javaindex 021cf18b11..647594bc84 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java@@ -26,6 +26,8 @@ import io.onedev.server.persistence.TransactionManager;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.MatrixRunner;+import io.onedev.server.util.script.identity.JobIdentity;+import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -103,6 +105,7 @@ public class RunJobAction extends PostBuildAction {public void run() {Build build = OneDev.getInstance(BuildManager.class).load(buildId);Build.push(build);+ ScriptIdentity.push(new JobIdentity(build.getProject(), build.getCommitId()));try {new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(getJobParams())) {@@ -118,6 +121,7 @@ public class RunJobAction extends PostBuildAction {build.getProject().getName(), build.getCommitHash(), jobName);logger.error(message, e);} finally {+ ScriptIdentity.pop();Build.pop();}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.javaindex 7581cb8702..277590031d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java@@ -5,6 +5,8 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.model.Build;import io.onedev.server.notification.BuildNotificationManager;+import io.onedev.server.util.script.identity.JobIdentity;+import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NotificationReceiver;@@ -28,8 +30,16 @@ public class SendNotificationAction extends PostBuildAction {@Overridepublic void execute(Build build) {- OneDev.getInstance(BuildNotificationManager.class).notify(build,- io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiver.fromString(receivers, build).getEmails());+ Build.push(build);+ ScriptIdentity.push(new JobIdentity(build.getProject(), build.getCommitId()));+ try {+ io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiver parsedReceiver =+ io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiver.parse(receivers, build);+ OneDev.getInstance(BuildNotificationManager.class).notify(build, parsedReceiver.getEmails());+ } finally {+ ScriptIdentity.pop();+ Build.pop();+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.g4 b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.g4index 8d24a4d8fe..29cf39c0ba 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.g4+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.g4@@ -6,6 +6,7 @@ conditioncriteria: operator=(Successful|Failed|Cancelled|TimedOut|PreviousIsSuccessful|PreviousIsFailed|PreviousIsCancelled|PreviousIsTimedOut|AssociatedWithPullRequests|RequiredByPullRequests) #OperatorCriteria+ | criteriaField=Quoted WS+ operator=IsEmpty #FieldOperatorCriteria| operator=OnBranch WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Contains|Is) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria@@ -70,6 +71,10 @@ Is: 'is';+IsEmpty+ : 'is' WS+ 'empty'+ ;+And: 'and';diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.javaindex 4e186c5857..bdd1f74967 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java@@ -2,7 +2,6 @@ package io.onedev.server.buildspec.job.action.condition;import java.util.ArrayList;import java.util.List;-import java.util.function.Predicate;import org.antlr.v4.runtime.BailErrorStrategy;import org.antlr.v4.runtime.BaseErrorListener;@@ -17,12 +16,10 @@ import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneException;import io.onedev.server.buildspec.job.Job;-import io.onedev.server.buildspec.job.action.condition.ActionConditionBaseVisitor;-import io.onedev.server.buildspec.job.action.condition.ActionConditionLexer;-import io.onedev.server.buildspec.job.action.condition.ActionConditionParser;import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.AndCriteriaContext;import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.ConditionContext;import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.CriteriaContext;+import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.FieldOperatorCriteriaContext;import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.FieldOperatorValueCriteriaContext;import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.NotCriteriaContext;import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.OperatorCriteriaContext;@@ -31,15 +28,18 @@ import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.OrCimport io.onedev.server.buildspec.job.action.condition.ActionConditionParser.ParensCriteriaContext;import io.onedev.server.model.Build;import io.onedev.server.util.criteria.AndCriteria;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.criteria.NotCriteria;import io.onedev.server.util.criteria.OrCriteria;import io.onedev.server.util.query.BuildQueryConstants;-public class ActionCondition implements Predicate<Build> {+public class ActionCondition extends Criteria<Build> {- private final Predicate<Build> criteria;+ private static final long serialVersionUID = 1L;- public ActionCondition(Predicate<Build> criteria) {+ private final Criteria<Build> criteria;++ public ActionCondition(Criteria<Build> criteria) {this.criteria = criteria;}@@ -47,8 +47,9 @@ public class ActionCondition implements Predicate<Build> {return StringUtils.unescape(FenceAware.unfence(token));}- public boolean test(Build build) {- return criteria.test(build);+ @Override+ public boolean matches(Build build) {+ return criteria.matches(build);}public static ActionCondition parse(Job job, String conditionString) {@@ -60,7 +61,7 @@ public class ActionCondition implements Predicate<Build> {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new OneException("Malformed condition syntax", e);+ throw new OneException("Malformed condition", e);}});@@ -75,23 +76,23 @@ public class ActionCondition implements Predicate<Build> {if (e instanceof OneException)throw e;else- throw new OneException("Malformed condition syntax", e);+ throw new OneException("Malformed condition", e);}- Predicate<Build> criteria;+ Criteria<Build> criteria;if (conditionContext.Always() != null) {criteria = new AlwaysCriteria();} else {- criteria = new ActionConditionBaseVisitor<Predicate<Build>>() {+ criteria = new ActionConditionBaseVisitor<Criteria<Build>>() {@Override- public Predicate<Build> visitParensCriteria(ParensCriteriaContext ctx) {- return visit(ctx.criteria());+ public Criteria<Build> visitParensCriteria(ParensCriteriaContext ctx) {+ return visit(ctx.criteria()).withParens(true);}@Override- public Predicate<Build> visitOperatorCriteria(OperatorCriteriaContext ctx) {+ public Criteria<Build> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {case ActionConditionLexer.Successful:return new SuccessfulCriteria();@@ -119,7 +120,15 @@ public class ActionCondition implements Predicate<Build> {}@Override- public Predicate<Build> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {+ public Criteria<Build> visitFieldOperatorCriteria(FieldOperatorCriteriaContext ctx) {+ String fieldName = getValue(ctx.Quoted().getText());+ int operator = ctx.operator.getType();+ checkField(job, fieldName, operator);+ return new ParamIsEmptyCriteria(fieldName);+ }++ @Override+ public Criteria<Build> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {String fieldName = getValue(ctx.Quoted(0).getText());String fieldValue = getValue(ctx.Quoted(1).getText());int operator = ctx.operator.getType();@@ -136,29 +145,29 @@ public class ActionCondition implements Predicate<Build> {}@Override- public Predicate<Build> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {+ public Criteria<Build> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {String fieldValue = getValue(ctx.Quoted().getText());return new OnBranchCriteria(fieldValue);}@Override- public Predicate<Build> visitOrCriteria(OrCriteriaContext ctx) {- List<Predicate<Build>> childCriterias = new ArrayList<>();+ public Criteria<Build> visitOrCriteria(OrCriteriaContext ctx) {+ List<Criteria<Build>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));return new OrCriteria<Build>(childCriterias);}@Override- public Predicate<Build> visitAndCriteria(AndCriteriaContext ctx) {- List<Predicate<Build>> childCriterias = new ArrayList<>();+ public Criteria<Build> visitAndCriteria(AndCriteriaContext ctx) {+ List<Criteria<Build>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));return new AndCriteria<Build>(childCriterias);}@Override- public Predicate<Build> visitNotCriteria(NotCriteriaContext ctx) {+ public Criteria<Build> visitNotCriteria(NotCriteriaContext ctx) {return new NotCriteria<Build>(visit(ctx.criteria()));}@@ -172,7 +181,7 @@ public class ActionCondition implements Predicate<Build> {if (operator != ActionConditionLexer.Contains)throw newOperatorException(fieldName, operator);} else if (job.getParamSpecMap().containsKey(fieldName)) {- if (operator != ActionConditionLexer.Is)+ if (operator != ActionConditionLexer.IsEmpty && operator != ActionConditionLexer.Is)throw newOperatorException(fieldName, operator);} else {throw new OneException("Param not found: " + fieldName);@@ -183,5 +192,14 @@ public class ActionCondition implements Predicate<Build> {return new OneException("Field '" + fieldName + "' is not applicable for operator '"+ AntlrUtils.getLexerRuleName(ActionConditionLexer.ruleNames, operator) + "'");}++ public static String getRuleName(int rule) {+ return AntlrUtils.getLexerRuleName(ActionConditionLexer.ruleNames, rule);+ }++ @Override+ public String asString() {+ return criteria.asString();+ }}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.javaindex b660b2a033..2a1e5ab66f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java@@ -1,14 +1,20 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;-import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class AlwaysCriteria extends Criteria<Build> {-public class AlwaysCriteria implements Predicate<Build> {+ private static final long serialVersionUID = 1L;@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return true;}+ @Override+ public String asString() {+ return ActionCondition.getRuleName(ActionConditionLexer.Always);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.javaindex fe52a418a2..8ad3d7ec00 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java@@ -1,14 +1,20 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;-import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class AssociatedWithPullRequestsCriteria extends Criteria<Build> {-public class AssociatedWithPullRequestsCriteria implements Predicate<Build> {+ private static final long serialVersionUID = 1L;@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return !build.getPullRequestBuilds().isEmpty();}+ @Override+ public String asString() {+ return ActionCondition.getRuleName(ActionConditionLexer.AssociatedWithPullRequests);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.javaindex a1bc7e6e2b..7efeaeab75 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java@@ -1,14 +1,20 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;-import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class CancelledCriteria extends Criteria<Build> {-public class CancelledCriteria implements Predicate<Build> {+ private static final long serialVersionUID = 1L;@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return build.getStatus() == Build.Status.CANCELLED;}+ @Override+ public String asString() {+ return ActionCondition.getRuleName(ActionConditionLexer.Cancelled);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.javaindex abcc54da4e..c65064a111 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java@@ -1,12 +1,15 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;import java.util.regex.Pattern;import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.query.BuildQueryConstants;-public class ErrorMessageCriteria implements Predicate<Build> {+public class ErrorMessageCriteria extends Criteria<Build> {+ private static final long serialVersionUID = 1L;+private final String value;public ErrorMessageCriteria(String value) {@@ -14,8 +17,15 @@ public class ErrorMessageCriteria implements Predicate<Build> {}@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return Pattern.compile(value).matcher(build.getErrorMessage()).find();}+ @Override+ public String asString() {+ return quote(BuildQueryConstants.FIELD_ERROR_MESSAGE) + " "+ + ActionCondition.getRuleName(ActionConditionLexer.Contains) + " "+ + quote(value);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.javaindex 329b4b3033..848accc598 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java@@ -1,14 +1,20 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;-import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class FailedCriteria extends Criteria<Build> {-public class FailedCriteria implements Predicate<Build> {+ private static final long serialVersionUID = 1L;@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return build.getStatus() == Build.Status.FAILED;}+ @Override+ public String asString() {+ return ActionCondition.getRuleName(ActionConditionLexer.Failed);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.javaindex ffe3eaaded..51fae1395a 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java@@ -1,14 +1,17 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;import java.util.regex.Pattern;import io.onedev.server.OneDev;import io.onedev.server.buildspec.job.log.LogManager;import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.query.BuildQueryConstants;-public class LogCriteria implements Predicate<Build> {+public class LogCriteria extends Criteria<Build> {+ private static final long serialVersionUID = 1L;+private final String value;public LogCriteria(String value) {@@ -16,9 +19,16 @@ public class LogCriteria implements Predicate<Build> {}@Override- public boolean test(Build build) {+ public boolean matches(Build build) {Pattern pattern = Pattern.compile(value);return OneDev.getInstance(LogManager.class).matches(build, pattern);}+ @Override+ public String asString() {+ return quote(BuildQueryConstants.FIELD_LOG) + " "+ + ActionCondition.getRuleName(ActionConditionLexer.Contains) + " "+ + quote(value);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.javaindex 1d94755a17..c25e33ebc4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java@@ -1,11 +1,12 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;-import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;-public class OnBranchCriteria implements Predicate<Build> {+public class OnBranchCriteria extends Criteria<Build> {+ private static final long serialVersionUID = 1L;+private final String branch;public OnBranchCriteria(String branch) {@@ -13,8 +14,14 @@ public class OnBranchCriteria implements Predicate<Build> {}@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return build.getProject().isCommitOnBranches(build.getCommitId(), branch);}+ @Override+ public String asString() {+ return ActionCondition.getRuleName(ActionConditionLexer.OnBranch) + " "+ + quote(branch);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.javaindex a41d5af8d4..a8fdf854ec 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java@@ -1,11 +1,13 @@package io.onedev.server.buildspec.job.action.condition;import java.util.List;-import java.util.function.Predicate;import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;-public class ParamCriteria implements Predicate<Build> {+public class ParamCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;private String name;@@ -17,12 +19,16 @@ public class ParamCriteria implements Predicate<Build> {}@Override- public boolean test(Build build) {+ public boolean matches(Build build) {List<String> paramValues = build.getParamMap().get(name);- if (paramValues == null || paramValues.isEmpty())- return value == null;- else- return paramValues.contains(value);+ return paramValues != null && paramValues.contains(value);}+ @Override+ public String asString() {+ return quote(name) + " "+ + ActionCondition.getRuleName(ActionConditionLexer.Is) + " "+ + quote(value);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamIsEmptyCriteria.javanew file mode 100644index 0000000000..b02327482e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamIsEmptyCriteria.java@@ -0,0 +1,29 @@+package io.onedev.server.buildspec.job.action.condition;++import java.util.List;++import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class ParamIsEmptyCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private String name;++ public ParamIsEmptyCriteria(String name) {+ this.name = name;+ }++ @Override+ public boolean matches(Build build) {+ List<String> paramValues = build.getParamMap().get(name);+ return paramValues == null || paramValues.isEmpty();+ }++ @Override+ public String asString() {+ return quote(name) + " " + ActionCondition.getRuleName(ActionConditionLexer.IsEmpty);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.javaindex 11250d0288..b06f1ea9a5 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java@@ -1,15 +1,21 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;-import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class PreviousIsCancelledCriteria extends Criteria<Build> {-public class PreviousIsCancelledCriteria implements Predicate<Build> {+ private static final long serialVersionUID = 1L;@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return build.getStreamPrevious(null) != null&& build.getStreamPrevious(null).getStatus() == Build.Status.CANCELLED;}+ @Override+ public String asString() {+ return ActionCondition.getRuleName(ActionConditionLexer.PreviousIsCancelled);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.javaindex 0fb61f2428..8e47d93190 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java@@ -1,15 +1,21 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;-import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class PreviousIsFailedCriteria extends Criteria<Build> {-public class PreviousIsFailedCriteria implements Predicate<Build> {+ private static final long serialVersionUID = 1L;@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return build.getStreamPrevious(null) != null&& build.getStreamPrevious(null).getStatus() == Build.Status.FAILED;}+ @Override+ public String asString() {+ return ActionCondition.getRuleName(ActionConditionLexer.PreviousIsFailed);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.javaindex e381c5d1d8..2561dcbff1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java@@ -1,15 +1,21 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;-import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class PreviousIsSuccessfulCriteria extends Criteria<Build> {-public class PreviousIsSuccessfulCriteria implements Predicate<Build> {+ private static final long serialVersionUID = 1L;@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return build.getStreamPrevious(null) != null&& build.getStreamPrevious(null).getStatus() == Build.Status.SUCCESSFUL;}+ @Override+ public String asString() {+ return ActionCondition.getRuleName(ActionConditionLexer.PreviousIsSuccessful);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.javaindex 63fd2d7677..a3e9d552f4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java@@ -1,15 +1,21 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;-import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class PreviousIsTimedOutCriteria extends Criteria<Build> {-public class PreviousIsTimedOutCriteria implements Predicate<Build> {+ private static final long serialVersionUID = 1L;@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return build.getStreamPrevious(null) != null&& build.getStreamPrevious(null).getStatus() == Build.Status.TIMED_OUT;}+ @Override+ public String asString() {+ return ActionCondition.getRuleName(ActionConditionLexer.PreviousIsTimedOut);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.javaindex 6991809b37..886df1d861 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java@@ -1,13 +1,20 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;-public class RequiredByPullRequestsCriteria implements Predicate<Build> {+public class RequiredByPullRequestsCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return build.getPullRequestBuilds().stream().anyMatch(it->it.isRequired());}+ @Override+ public String asString() {+ return ActionCondition.getRuleName(ActionConditionLexer.RequiredByPullRequests);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.javaindex 29725871b2..e0ef0e291e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java@@ -1,14 +1,20 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;-import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class SuccessfulCriteria extends Criteria<Build> {-public class SuccessfulCriteria implements Predicate<Build> {+ private static final long serialVersionUID = 1L;@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return build.getStatus() == Build.Status.SUCCESSFUL;}+ @Override+ public String asString() {+ return ActionCondition.getRuleName(ActionConditionLexer.Successful);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.javaindex e7a59615bf..b244182662 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java@@ -1,14 +1,20 @@package io.onedev.server.buildspec.job.action.condition;-import java.util.function.Predicate;-import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class TimedOutCriteria extends Criteria<Build> {-public class TimedOutCriteria implements Predicate<Build> {+ private static final long serialVersionUID = 1L;@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return build.getStatus() == Build.Status.TIMED_OUT;}+ @Override+ public String asString() {+ return ActionCondition.getRuleName(ActionConditionLexer.TimedOut);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.javaindex 7969a6c3c8..6bd1d3a6f0 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java@@ -21,8 +21,6 @@ import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;-import io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiverLexer;-import io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiverParser;import io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiverParser.CriteriaContext;import io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiverParser.ReceiverContext;import io.onedev.server.entitymanager.GroupManager;@@ -39,10 +37,27 @@ public class NotificationReceiver {this.emails = emails;}- public static NotificationReceiver fromString(String receiverString, @Nullable Build build) {+ public static NotificationReceiver parse(String receiverString, @Nullable Build build) {Collection<String> emails = new HashSet<>();- ReceiverContext receiver = parse(receiverString);+ CharStream is = CharStreams.fromString(receiverString);+ NotificationReceiverLexer lexer = new NotificationReceiverLexer(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 notification receiver");+ }++ });+ CommonTokenStream tokens = new CommonTokenStream(lexer);+ NotificationReceiverParser parser = new NotificationReceiverParser(tokens);+ parser.removeErrorListeners();+ parser.setErrorHandler(new BailErrorStrategy());++ ReceiverContext receiver = parser.receiver();for (CriteriaContext criteria: receiver.criteria()) {if (criteria.userCriteria() != null) {@@ -102,26 +117,6 @@ public class NotificationReceiver {return new NotificationReceiver(emails);}- public static ReceiverContext parse(String requirementString) {- CharStream is = CharStreams.fromString(requirementString);- NotificationReceiverLexer lexer = new NotificationReceiverLexer(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 notification receiver");- }-- });- CommonTokenStream tokens = new CommonTokenStream(lexer);- NotificationReceiverParser parser = new NotificationReceiverParser(tokens);- parser.removeErrorListeners();- parser.setErrorHandler(new BailErrorStrategy());- return parser.receiver();- }-private static String getValue(TerminalNode terminal) {return StringUtils.unescape(FenceAware.unfence(terminal.getText()));}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/Criteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/Criteria.javadeleted file mode 100644index b51e970ba5..0000000000--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/Criteria.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.buildspec.job.retrycondition;--import java.io.Serializable;--import io.onedev.server.model.Build;--public abstract class Criteria implements Serializable {-- private static final long serialVersionUID = 1L;-- public abstract boolean satisfied(Build build);--}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.javaindex 1476f9d21f..3f244b8196 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java@@ -1,12 +1,15 @@package io.onedev.server.buildspec.job.retrycondition;-import java.util.function.Predicate;import java.util.regex.Pattern;import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.query.BuildQueryConstants;-public class ErrorMessageCriteria implements Predicate<Build> {+public class ErrorMessageCriteria extends Criteria<Build> {+ private static final long serialVersionUID = 1L;+private final String value;public ErrorMessageCriteria(String value) {@@ -14,8 +17,15 @@ public class ErrorMessageCriteria implements Predicate<Build> {}@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return Pattern.compile(value).matcher(build.getErrorMessage()).find();}+ @Override+ public String asString() {+ return quote(BuildQueryConstants.FIELD_ERROR_MESSAGE) + " "+ + RetryCondition.getRuleName(RetryConditionLexer.Contains) + " "+ + quote(value);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.javaindex 6305963581..f46494e0c1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java@@ -1,14 +1,17 @@package io.onedev.server.buildspec.job.retrycondition;-import java.util.function.Predicate;import java.util.regex.Pattern;import io.onedev.server.OneDev;import io.onedev.server.buildspec.job.log.LogManager;import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.query.BuildQueryConstants;-public class LogCriteria implements Predicate<Build> {+public class LogCriteria extends Criteria<Build> {+ private static final long serialVersionUID = 1L;+private final String value;public LogCriteria(String value) {@@ -16,9 +19,16 @@ public class LogCriteria implements Predicate<Build> {}@Override- public boolean test(Build build) {+ public boolean matches(Build build) {Pattern pattern = Pattern.compile(value);return OneDev.getInstance(LogManager.class).matches(build, pattern);}+ @Override+ public String asString() {+ return quote(BuildQueryConstants.FIELD_LOG) + " "+ + RetryCondition.getRuleName(RetryConditionLexer.Contains) + " "+ + quote(value);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.javaindex 24b6834d9a..8a9a9fbc64 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java@@ -1,14 +1,20 @@package io.onedev.server.buildspec.job.retrycondition;-import java.util.function.Predicate;-import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class NeverCriteria extends Criteria<Build> {-public class NeverCriteria implements Predicate<Build> {+ private static final long serialVersionUID = 1L;@Override- public boolean test(Build build) {+ public boolean matches(Build build) {return false;}+ @Override+ public String asString() {+ return RetryCondition.getRuleName(RetryConditionLexer.Never);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.javaindex e737b10d52..7acca43b47 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java@@ -1,11 +1,13 @@package io.onedev.server.buildspec.job.retrycondition;import java.util.List;-import java.util.function.Predicate;import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;-public class ParamCriteria implements Predicate<Build> {+public class ParamCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;private String name;@@ -17,12 +19,16 @@ public class ParamCriteria implements Predicate<Build> {}@Override- public boolean test(Build build) {+ public boolean matches(Build build) {List<String> paramValues = build.getParamMap().get(name);- if (paramValues == null || paramValues.isEmpty())- return value == null;- else- return paramValues.contains(value);+ return paramValues != null && paramValues.contains(value);}+ @Override+ public String asString() {+ return quote(name) + " "+ + RetryCondition.getRuleName(RetryConditionLexer.Is) + " "+ + quote(value);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamIsEmptyCriteria.javanew file mode 100644index 0000000000..e4b7c304be--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamIsEmptyCriteria.java@@ -0,0 +1,29 @@+package io.onedev.server.buildspec.job.retrycondition;++import java.util.List;++import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class ParamIsEmptyCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private String name;++ public ParamIsEmptyCriteria(String name) {+ this.name = name;+ }++ @Override+ public boolean matches(Build build) {+ List<String> paramValues = build.getParamMap().get(name);+ return paramValues == null || paramValues.isEmpty();+ }++ @Override+ public String asString() {+ return quote(name) + " " + RetryCondition.getRuleName(RetryConditionLexer.IsEmpty);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.g4 b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.g4index 4aa3807347..fc91ac7019 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.g4+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.g4@@ -5,7 +5,8 @@ condition;criteria- : criteriaField=Quoted WS+ operator=(Contains|Is) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ : criteriaField=Quoted WS+ operator=IsEmpty #FieldOperatorCriteria+ | criteriaField=Quoted WS+ operator=(Contains|Is) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria@@ -24,6 +25,10 @@ Is: 'is';+IsEmpty+ : 'is' WS+ 'empty'+ ;+And: 'and';diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.javaindex 774435793e..d333086e96 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java@@ -2,7 +2,6 @@ package io.onedev.server.buildspec.job.retrycondition;import java.util.ArrayList;import java.util.List;-import java.util.function.Predicate;import org.antlr.v4.runtime.BailErrorStrategy;import org.antlr.v4.runtime.BaseErrorListener;@@ -17,27 +16,28 @@ import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneException;import io.onedev.server.buildspec.job.Job;-import io.onedev.server.buildspec.job.retrycondition.RetryConditionBaseVisitor;-import io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer;-import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser;import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.AndCriteriaContext;import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.ConditionContext;import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.CriteriaContext;+import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.FieldOperatorCriteriaContext;import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.FieldOperatorValueCriteriaContext;import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.NotCriteriaContext;import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.OrCriteriaContext;import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.ParensCriteriaContext;import io.onedev.server.model.Build;import io.onedev.server.util.criteria.AndCriteria;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.criteria.NotCriteria;import io.onedev.server.util.criteria.OrCriteria;import io.onedev.server.util.query.BuildQueryConstants;-public class RetryCondition implements Predicate<Build> {+public class RetryCondition extends Criteria<Build> {- private final Predicate<Build> criteria;+ private static final long serialVersionUID = 1L;- public RetryCondition(Predicate<Build> criteria) {+ private final Criteria<Build> criteria;++ public RetryCondition(Criteria<Build> criteria) {this.criteria = criteria;}@@ -45,8 +45,8 @@ public class RetryCondition implements Predicate<Build> {return StringUtils.unescape(FenceAware.unfence(token));}- public boolean test(Build context) {- return criteria.test(context);+ public boolean matches(Build build) {+ return criteria.matches(build);}public static RetryCondition parse(Job job, String conditionString) {@@ -58,7 +58,7 @@ public class RetryCondition implements Predicate<Build> {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new OneException("Malformed condition syntax", e);+ throw new OneException("Malformed condition", e);}});@@ -73,23 +73,31 @@ public class RetryCondition implements Predicate<Build> {if (e instanceof OneException)throw e;else- throw new OneException("Malformed condition syntax", e);+ throw new OneException("Malformed condition", e);}- Predicate<Build> criteria;+ Criteria<Build> criteria;if (conditionContext.Never() != null) {criteria = new NeverCriteria();} else {- criteria = new RetryConditionBaseVisitor<Predicate<Build>>() {+ criteria = new RetryConditionBaseVisitor<Criteria<Build>>() {@Override- public Predicate<Build> visitParensCriteria(ParensCriteriaContext ctx) {- return visit(ctx.criteria());+ public Criteria<Build> visitParensCriteria(ParensCriteriaContext ctx) {+ return visit(ctx.criteria()).withParens(true);}@Override- public Predicate<Build> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {+ public Criteria<Build> visitFieldOperatorCriteria(FieldOperatorCriteriaContext ctx) {+ String fieldName = getValue(ctx.Quoted().getText());+ int operator = ctx.operator.getType();+ checkField(job, fieldName, operator);+ return new ParamIsEmptyCriteria(fieldName);+ }++ @Override+ public Criteria<Build> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {String fieldName = getValue(ctx.Quoted(0).getText());String fieldValue = getValue(ctx.Quoted(1).getText());int operator = ctx.operator.getType();@@ -107,23 +115,23 @@ public class RetryCondition implements Predicate<Build> {}@Override- public Predicate<Build> visitOrCriteria(OrCriteriaContext ctx) {- List<Predicate<Build>> childCriterias = new ArrayList<>();+ public Criteria<Build> visitOrCriteria(OrCriteriaContext ctx) {+ List<Criteria<Build>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));return new OrCriteria<Build>(childCriterias);}@Override- public Predicate<Build> visitAndCriteria(AndCriteriaContext ctx) {- List<Predicate<Build>> childCriterias = new ArrayList<>();+ public Criteria<Build> visitAndCriteria(AndCriteriaContext ctx) {+ List<Criteria<Build>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));return new AndCriteria<Build>(childCriterias);}@Override- public Predicate<Build> visitNotCriteria(NotCriteriaContext ctx) {+ public Criteria<Build> visitNotCriteria(NotCriteriaContext ctx) {return new NotCriteria<Build>(visit(ctx.criteria()));}@@ -137,16 +145,25 @@ public class RetryCondition implements Predicate<Build> {if (operator != RetryConditionLexer.Contains)throw newOperatorException(fieldName, operator);} else if (job.getParamSpecMap().containsKey(fieldName)) {- if (operator != RetryConditionLexer.Is)+ if (operator != RetryConditionLexer.IsEmpty && operator != RetryConditionLexer.Is)throw newOperatorException(fieldName, operator);} else {throw new OneException("Param not found: " + fieldName);}}+ public static String getRuleName(int rule) {+ return AntlrUtils.getLexerRuleName(RetryConditionLexer.ruleNames, rule);+ }+private static OneException newOperatorException(String fieldName, int operator) {return new OneException("Field '" + fieldName + "' is not applicable for operator '"+ AntlrUtils.getLexerRuleName(RetryConditionLexer.ruleNames, operator) + "'");}++ @Override+ public String asString() {+ return criteria.asString();+ }}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.javaindex 1539a4501b..be9477fa3f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java@@ -73,7 +73,7 @@ public class BranchUpdateTrigger extends JobTrigger {} else {Collection<String> changedFiles = GitUtils.getChangedFiles(refUpdated.getProject().getRepository(),refUpdated.getOldCommitId(), refUpdated.getNewCommitId());- PatternSet patternSet = PatternSet.fromString(getPaths());+ PatternSet patternSet = PatternSet.parse(getPaths());Matcher matcher = new PathMatcher();for (String changedFile: changedFiles) {if (patternSet.matches(matcher, changedFile))@@ -92,7 +92,7 @@ public class BranchUpdateTrigger extends JobTrigger {RefUpdated refUpdated = (RefUpdated) event;String branch = GitUtils.ref2branch(refUpdated.getRefName());if (branch != null) {- if ((getBranches() == null || PatternSet.fromString(getBranches()).matches(new PathMatcher(), branch))+ if ((getBranches() == null || PatternSet.parse(getBranches()).matches(new PathMatcher(), branch))&& touchedFile(refUpdated)) {return true;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.javaindex 74f8411b78..069d5a1741 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java@@ -69,7 +69,7 @@ public class PullRequestTrigger extends JobTrigger {if (getPaths() != null) {Collection<String> changedFiles = GitUtils.getChangedFiles(request.getTargetProject().getRepository(),request.getTarget().getObjectId(), ObjectId.fromString(request.getLastMergePreview().getMerged()));- PatternSet patternSet = PatternSet.fromString(getPaths());+ PatternSet patternSet = PatternSet.parse(getPaths());Matcher matcher = new PathMatcher();for (String changedFile: changedFiles) {if (patternSet.matches(matcher, changedFile))@@ -87,7 +87,7 @@ public class PullRequestTrigger extends JobTrigger {PullRequestMergePreviewCalculated pullRequestMergePreviewCalculated = (PullRequestMergePreviewCalculated) event;String branch = pullRequestMergePreviewCalculated.getRequest().getTargetBranch();if (branch != null) {- if ((getBranches() == null || PatternSet.fromString(getBranches()).matches(new PathMatcher(), branch))+ if ((getBranches() == null || PatternSet.parse(getBranches()).matches(new PathMatcher(), branch))&& touchedFile(pullRequestMergePreviewCalculated.getRequest())) {return true;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.javaindex 122419e147..3aa642d6fd 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java@@ -48,7 +48,7 @@ public class TagCreateTrigger extends JobTrigger {RefUpdated refUpdated = (RefUpdated) event;String pushedTag = GitUtils.ref2tag(refUpdated.getRefName());if (pushedTag != null && !refUpdated.getNewCommitId().equals(ObjectId.zeroId())- && (getTags() == null || PatternSet.fromString(getTags()).matches(new PathMatcher(), pushedTag))) {+ && (getTags() == null || PatternSet.parse(getTags()).matches(new PathMatcher(), pushedTag))) {return true;}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.javaindex 0d3c1f5951..18b6c366dd 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java@@ -12,4 +12,9 @@ public interface RoleManager extends EntityManager<Role> {Role find(String name);void setupDefaults();++ void onRenameIssueField(String oldName, String newName);++ void onDeleteIssueField(String fieldName);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 19d3649b25..9623878f9b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -64,6 +64,7 @@ import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.BuildPreservation;import io.onedev.server.model.support.role.JobPrivilege;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -105,6 +106,8 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsprivate final TaskScheduler taskScheduler;+ private final SessionManager sessionManager;+private final TransactionManager transactionManager;private final Map<Long, BuildFacade> builds = new HashMap<>();@@ -121,7 +124,8 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementspublic DefaultBuildManager(Dao dao, BuildParamManager buildParamManager,TaskScheduler taskScheduler, BuildDependenceManager buildDependenceManager,GroupManager groupManager, StorageManager storageManager,- ProjectManager projectManager, TransactionManager transactionManager) {+ ProjectManager projectManager, SessionManager sessionManager,+ TransactionManager transactionManager) {super(dao);this.buildParamManager = buildParamManager;this.buildDependenceManager = buildDependenceManager;@@ -129,6 +133,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsthis.groupManager = groupManager;this.projectManager = projectManager;this.taskScheduler = taskScheduler;+ this.sessionManager = sessionManager;this.transactionManager = transactionManager;}@@ -541,30 +546,38 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementspublic void execute() {long maxId = getMaxId();Collection<Long> idsToPreserve = new HashSet<>();- for (Project project: projectManager.query()) {- logger.debug("Populating preserved build ids of project '" + project.getName() + "'...");- List<BuildPreservation> preservations = project.getBuildSetting().getHierarchyBuildPreservations(project);- if (preservations.isEmpty()) {- idsToPreserve.addAll(queryIds(project, new BuildQuery(), 0, Integer.MAX_VALUE));- } else {- for (BuildPreservation preservation: preservations) {- try {- BuildQuery query = BuildQuery.parse(project, preservation.getCondition(), false, false);- int count;- if (preservation.getCount() != null)- count = preservation.getCount();- else- count = Integer.MAX_VALUE;- idsToPreserve.addAll(queryIds(project, query, 0, count));- } catch (Exception e) {- String message = String.format("Error parsing build preserve condition(project: %s, condition: %s)",- project.getName(), preservation.getCondition());- logger.error(message, e);++ sessionManager.run(new Runnable() {++ @Override+ public void run() {+ for (Project project: projectManager.query()) {+ logger.debug("Populating preserved build ids of project '" + project.getName() + "'...");+ List<BuildPreservation> preservations = project.getBuildSetting().getHierarchyBuildPreservations(project);+ if (preservations.isEmpty()) {idsToPreserve.addAll(queryIds(project, new BuildQuery(), 0, Integer.MAX_VALUE));+ } else {+ for (BuildPreservation preservation: preservations) {+ try {+ BuildQuery query = BuildQuery.parse(project, preservation.getCondition(), false, false);+ int count;+ if (preservation.getCount() != null)+ count = preservation.getCount();+ else+ count = Integer.MAX_VALUE;+ idsToPreserve.addAll(queryIds(project, query, 0, count));+ } catch (Exception e) {+ String message = String.format("Error parsing build preserve condition(project: %s, condition: %s)",+ project.getName(), preservation.getCondition());+ logger.error(message, e);+ idsToPreserve.addAll(queryIds(project, new BuildQuery(), 0, Integer.MAX_VALUE));+ }+ }}}}- }++ });EntityCriteria<Build> criteria = newCriteria();AtomicInteger firstResult = new AtomicInteger(0);@@ -741,7 +754,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements} else {StringMatcher matcher = new StringMatcher();for (JobPrivilege jobPrivilege: role.getJobPrivileges()) {- PatternSet patternSet = PatternSet.fromString(jobPrivilege.getJobNames());+ PatternSet patternSet = PatternSet.parse(jobPrivilege.getJobNames());for (String jobName: jobNames) {if (patternSet.matches(matcher, jobName))accessibleJobNames.add(jobName);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex 9ec2727caa..9f5162eea8 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -6,7 +6,6 @@ import java.util.HashMap;import java.util.Iterator;import java.util.List;import java.util.Map;-import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.inject.Inject;@@ -23,14 +22,17 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.event.RefUpdated;import io.onedev.server.event.build.BuildFinished;import io.onedev.server.event.issue.IssueChangeEvent;-import io.onedev.server.event.issue.IssueCommitted;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;import io.onedev.server.event.pullrequest.PullRequestOpened;+import io.onedev.server.git.GitUtils;import io.onedev.server.issue.TransitionSpec;+import io.onedev.server.issue.transitiontrigger.BranchUpdateTrigger;import io.onedev.server.issue.transitiontrigger.BuildSuccessfulTrigger;-import io.onedev.server.issue.transitiontrigger.CommitTrigger;import io.onedev.server.issue.transitiontrigger.DiscardPullRequest;import io.onedev.server.issue.transitiontrigger.MergePullRequest;import io.onedev.server.issue.transitiontrigger.OpenPullRequest;@@ -63,7 +65,10 @@ import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.util.Input;+import io.onedev.server.util.ProjectAwareCommit;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.match.Matcher;+import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.match.StringMatcher;import io.onedev.server.util.patternset.PatternSet;@@ -77,6 +82,10 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeprivate final TransactionManager transactionManager;+ private final ProjectManager projectManager;++ private final PullRequestManager pullRequestManager;+private final BuildManager buildManager;private final ListenerRegistry listenerRegistry;@@ -84,11 +93,14 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Injectpublic DefaultIssueChangeManager(Dao dao, TransactionManager transactionManager,IssueManager issueManager, IssueFieldManager issueFieldManager,- BuildManager buildManager, ListenerRegistry listenerRegistry) {+ ProjectManager projectManager, BuildManager buildManager,+ PullRequestManager pullRequestManager, ListenerRegistry listenerRegistry) {super(dao);this.issueManager = issueManager;this.issueFieldManager = issueFieldManager;this.transactionManager = transactionManager;+ this.projectManager = projectManager;+ this.pullRequestManager = pullRequestManager;this.buildManager = buildManager;this.listenerRegistry = listenerRegistry;}@@ -233,10 +245,10 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeBuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) transition.getTrigger();String branches = trigger.getBranches();ObjectId commitId = ObjectId.fromString(build.getCommitHash());- if ((trigger.getJobNames() == null || PatternSet.fromString(trigger.getJobNames()).matches(new StringMatcher(), build.getJobName()))+ if ((trigger.getJobNames() == null || PatternSet.parse(trigger.getJobNames()).matches(new StringMatcher(), build.getJobName()))&& build.getStatus() == Build.Status.SUCCESSFUL&& (branches == null || project.isCommitOnBranches(commitId, branches))) {- IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true, false, true);+ IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true, false, true, false, false);List<IssueCriteria> criterias = new ArrayList<>();for (String fromState: transition.getFromStates())criterias.add(new StateCriteria(fromState));@@ -261,52 +273,86 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange}private void on(PullRequest request, Class<? extends PullRequestTrigger> triggerClass) {- for (TransitionSpec transition: request.getTargetProject().getIssueSetting().getTransitionSpecs(true)) {- if (transition.getTrigger().getClass() == triggerClass) {- PullRequestTrigger trigger = (PullRequestTrigger) transition.getTrigger();- if (trigger.getBranch().equals(request.getTargetBranch())) {- for (Issue issue: request.getFixedIssues()) {- if (transition.getFromStates().contains(issue.getState())) {- issue.removeFields(transition.getRemoveFields());- changeState(issue, transition.getToState(), new HashMap<>(), null);+ Long requestId = request.getId();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ transactionManager.runAsync(new Runnable() {++ @Override+ public void run() {+ Matcher matcher = new PathMatcher();+ PullRequest request = pullRequestManager.load(requestId);+ Project project = request.getTargetProject();+ for (TransitionSpec transition: project.getIssueSetting().getTransitionSpecs(true)) {+ if (transition.getTrigger().getClass() == triggerClass) {+ PullRequestTrigger trigger = (PullRequestTrigger) transition.getTrigger();+ if (trigger.getBranches() == null || PatternSet.parse(trigger.getBranches()).matches(matcher, request.getTargetBranch())) {+ IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true, false, false, true, false);+ List<IssueCriteria> criterias = new ArrayList<>();+ for (String fromState: transition.getFromStates())+ criterias.add(new StateCriteria(fromState));+ criterias.add(query.getCriteria());+ query = new IssueQuery(IssueCriteria.of(criterias), new ArrayList<>());+ PullRequest.push(request);+ try {+ for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE)) {+ issue.removeFields(transition.getRemoveFields());+ changeState(issue, transition.getToState(), new HashMap<>(), null);+ }+ } finally {+ PullRequest.pop();+ }+ }+ }}}- }+ });}- }+ });}@Transactional@Listenpublic void on(PullRequestChangeEvent event) {if (event.getChange().getData() instanceof PullRequestMergeData) {- for (Issue issue: event.getRequest().getFixedIssues()) {- IssueChange change = new IssueChange();- change.setDate(event.getDate());- change.setUser(event.getUser());- change.setIssue(issue);- change.setData(new IssuePullRequestMergedData(event.getRequest()));- save(change);+ for (Long issueNumber: event.getRequest().getFixedIssueNumbers()) {+ Issue issue = issueManager.find(event.getProject(), issueNumber);+ if (issue != null) {+ IssueChange change = new IssueChange();+ change.setDate(event.getDate());+ change.setUser(event.getUser());+ change.setIssue(issue);+ change.setData(new IssuePullRequestMergedData(event.getRequest()));+ save(change);+ }}on(event.getRequest(), MergePullRequest.class);} else if (event.getChange().getData() instanceof PullRequestDiscardData) {- for (Issue issue: event.getRequest().getFixedIssues()) {- IssueChange change = new IssueChange();- change.setDate(event.getDate());- change.setUser(event.getUser());- change.setIssue(issue);- change.setData(new IssuePullRequestDiscardedData(event.getRequest()));- save(change);+ for (Long issueNumber: event.getRequest().getFixedIssueNumbers()) {+ Issue issue = issueManager.find(event.getProject(), issueNumber);+ if (issue != null) {+ IssueChange change = new IssueChange();+ change.setDate(event.getDate());+ change.setUser(event.getUser());+ change.setIssue(issue);+ change.setData(new IssuePullRequestDiscardedData(event.getRequest()));+ save(change);+ }}on(event.getRequest(), DiscardPullRequest.class);} else if (event.getChange().getData() instanceof PullRequestReopenData) {- for (Issue issue: event.getRequest().getFixedIssues()) {- IssueChange change = new IssueChange();- change.setDate(event.getDate());- change.setUser(event.getUser());- change.setIssue(issue);- change.setData(new IssuePullRequestReopenedData(event.getRequest()));- save(change);+ for (Long issueNumber: event.getRequest().getFixedIssueNumbers()) {+ Issue issue = issueManager.find(event.getProject(), issueNumber);+ if (issue != null) {+ IssueChange change = new IssueChange();+ change.setDate(event.getDate());+ change.setUser(event.getUser());+ change.setIssue(issue);+ change.setData(new IssuePullRequestReopenedData(event.getRequest()));+ save(change);+ }}on(event.getRequest(), OpenPullRequest.class);}@@ -315,48 +361,76 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Transactional@Listenpublic void on(PullRequestOpened event) {- for (Issue issue: event.getRequest().getFixedIssues()) {- IssueChange change = new IssueChange();- change.setDate(event.getDate());- change.setUser(event.getUser());- change.setIssue(issue);- change.setData(new IssuePullRequestOpenedData(event.getRequest()));- save(change);+ for (Long issueNumber: event.getRequest().getFixedIssueNumbers()) {+ Issue issue = issueManager.find(event.getProject(), issueNumber);+ if (issue != null) {+ IssueChange change = new IssueChange();+ change.setDate(event.getDate());+ change.setUser(event.getUser());+ change.setIssue(issue);+ change.setData(new IssuePullRequestOpenedData(event.getRequest()));+ save(change);+ }}on(event.getRequest(), OpenPullRequest.class);}@Transactional@Listen- public void on(IssueCommitted event) {- Issue issue = event.getIssue();-- IssueChange change = new IssueChange();- change.setIssue(issue);- change.setDate(new Date());- change.setData(new IssueCommittedData(event.getFixCommits().stream().map(it->it.name()).collect(Collectors.toList())));- save(change);-- for (TransitionSpec transition: issue.getProject().getIssueSetting().getTransitionSpecs(true)) {- if (transition.getTrigger() instanceof CommitTrigger && transition.getFromStates().contains(issue.getState())) {- CommitTrigger commitTrigger = (CommitTrigger) transition.getTrigger();- boolean applicable;- if (commitTrigger.getBranches() == null) {- applicable = true;- } else {- for (ObjectId commitId: event.getFixCommits()) {- if (issue.getProject().isCommitOnBranches(commitId, commitTrigger.getBranches())) {- applicable = true;- break;- }- }- applicable = false;- }- if (applicable) {- issue.removeFields(transition.getRemoveFields());- changeState(issue, transition.getToState(), new HashMap<>(), null);+ public void on(RefUpdated event) {+ if (!event.getNewCommitId().equals(ObjectId.zeroId())+ && GitUtils.ref2branch(event.getRefName()) != null) {+ for (Long issueNumber: event.getCommit().getFixedIssueNumbers()) {+ Issue issue = issueManager.find(event.getProject(), issueNumber);+ if (issue != null) {+ IssueChange change = new IssueChange();+ change.setIssue(issue);+ change.setDate(new Date());+ change.setData(new IssueCommittedData(event.getCommit().getCommitId().name()));+ save(change);}}++ Long projectId = event.getCommit().getProject().getId();+ ObjectId commitId = event.getCommit().getCommitId();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ transactionManager.runAsync(new Runnable() {++ @Override+ public void run() {+ Project project = projectManager.load(projectId);+ ProjectAwareCommit commit = new ProjectAwareCommit(project, commitId);+ for (TransitionSpec transition: project.getIssueSetting().getTransitionSpecs(true)) {+ if (transition.getTrigger() instanceof BranchUpdateTrigger) {+ BranchUpdateTrigger trigger = (BranchUpdateTrigger) transition.getTrigger();+ String branches = trigger.getBranches();+ if (branches == null || project.isCommitOnBranches(commitId, branches)) {+ IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(),+ true, false, false, false, true);+ List<IssueCriteria> criterias = new ArrayList<>();+ for (String fromState: transition.getFromStates())+ criterias.add(new StateCriteria(fromState));+ criterias.add(query.getCriteria());+ query = new IssueQuery(IssueCriteria.of(criterias), new ArrayList<>());+ ProjectAwareCommit.push(commit);+ try {+ for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE)) {+ issue.removeFields(transition.getRemoveFields());+ changeState(issue, transition.getToState(), new HashMap<>(), null);+ }+ } finally {+ ProjectAwareCommit.pop();+ }+ }+ }+ }+ }+ });+ }+ });}}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 5153f9eb14..9319ba383a 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@@ -62,7 +62,7 @@ import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.issue.AndCriteria;+import io.onedev.server.search.entity.issue.AndIssueCriteria;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.MilestoneCriteria;@@ -277,7 +277,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsList<IssueCriteria> criterias = new ArrayList<>();criterias.add(new MilestoneCriteria(milestone.getName()));criterias.add(criteria);- return count(milestone.getProject(), new AndCriteria(criterias));+ return count(milestone.getProject(), new AndIssueCriteria(criterias));} else {return 0;}@@ -315,7 +315,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsList<NamedIssueQuery> namedQueries) {for (NamedIssueQuery namedQuery: namedQueries) {try {- undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true).getUndefinedStates());+ undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedStates());} catch (Exception e) {}}@@ -345,7 +345,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsList<NamedIssueQuery> namedQueries) {for (NamedIssueQuery namedQuery: namedQueries) {try {- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true);+ IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());namedQuery.setQuery(query.toString());@@ -410,7 +410,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Nullable Project project, List<NamedIssueQuery> namedQueries) {for (NamedIssueQuery namedQuery: namedQueries) {try {- undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true).getUndefinedFields());+ undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFields());} catch (Exception e) {}}@@ -447,7 +447,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsfor (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true);+ IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);boolean remove = false;for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {UndefinedFieldResolution resolution = entry.getValue();@@ -484,7 +484,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}for (Project project: projectManager.query())- undefinedFieldValues.addAll(project.getIssueSetting().getUndefinedFieldValues());+ undefinedFieldValues.addAll(project.getIssueSetting().getUndefinedFieldValues(project));for (IssueQuerySetting setting: issueQuerySettingManager.query())populateUndefinedFieldValues(undefinedFieldValues, setting.getProject(), setting.getUserQueries());@@ -499,7 +499,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Nullable Project project, List<NamedIssueQuery> namedQueries) {for (NamedIssueQuery namedQuery: namedQueries) {try {- undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true).getUndefinedFieldValues());+ undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFieldValues());} catch (Exception e) {}}@@ -526,7 +526,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}for (Project project: projectManager.query()) {- project.getIssueSetting().fixUndefinedFieldValues(valueSetEdits);+ project.getIssueSetting().fixUndefinedFieldValues(project, valueSetEdits);}for (IssueQuerySetting setting: issueQuerySettingManager.query())@@ -541,7 +541,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsfor (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true);+ IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);if (query.fixUndefinedFieldValues(valueSetEdits))it.remove();elsediff --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 c40184b372..9aa68b3d33 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@@ -355,7 +355,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {BranchProtection protection = it.next();- PatternSet patternSet = PatternSet.fromString(protection.getBranches());+ PatternSet patternSet = PatternSet.parse(protection.getBranches());patternSet.getIncludes().remove(branchName);patternSet.getExcludes().remove(branchName);protection.setBranches(patternSet.toString());@@ -407,7 +407,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>Usage usage = new Usage();for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {TagProtection protection = it.next();- PatternSet patternSet = PatternSet.fromString(protection.getTags());+ PatternSet patternSet = PatternSet.parse(protection.getTags());patternSet.getIncludes().remove(tagName);patternSet.getExcludes().remove(tagName);protection.setTags(patternSet.toString());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 e3e53e18ed..1b2c2a2081 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@@ -688,7 +688,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestrequest.getTargetBranch(), request.getSubmitter());checkReviews(branchProtection.getParsedReviewRequirement(), request.getLatestUpdate());- ReviewRequirement checkedRequirement = ReviewRequirement.fromString(null);+ ReviewRequirement checkedRequirement = ReviewRequirement.parse(null, true);for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {if (branchProtection.getFileProtections().stream().allMatch(it->checkedRequirement.covers(it.getParsedReviewRequirement()))) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.javaindex 96c9c81b30..8ed3a37b00 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java@@ -7,15 +7,18 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import com.google.common.collect.Lists;-import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.Role;+import io.onedev.server.model.support.role.AllIssueFields;+import io.onedev.server.model.support.role.ExcludeIssueFields;import io.onedev.server.model.support.role.CodePrivilege;+import io.onedev.server.model.support.role.IssueFieldSet;import io.onedev.server.model.support.role.JobPrivilege;+import io.onedev.server.model.support.role.NoneIssueFields;+import io.onedev.server.model.support.role.IncludeIssueFields;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;@@ -94,7 +97,7 @@ public class DefaultRoleManager extends AbstractEntityManager<Role> implements Rdeveloper.setName("Developer");developer.setCodePrivilege(CodePrivilege.WRITE);developer.setScheduleIssues(true);- developer.setEditableIssueFields(Lists.newArrayList("Type", "Priority", "Assignee", "Resolution", "Duplicate With"));+ developer.setEditableIssueFields(new AllIssueFields());JobPrivilege jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");@@ -107,7 +110,7 @@ public class DefaultRoleManager extends AbstractEntityManager<Role> implements Rtester.setName("Tester");tester.setCodePrivilege(CodePrivilege.READ);tester.setScheduleIssues(true);- tester.setEditableIssueFields(Lists.newArrayList("Type", "Priority", "Assignee", "Resolution", "Duplicate With"));+ tester.setEditableIssueFields(new AllIssueFields());jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");@@ -119,7 +122,9 @@ public class DefaultRoleManager extends AbstractEntityManager<Role> implements RRole reporter = new Role();reporter.setName("Reporter");reporter.setCodePrivilege(CodePrivilege.NONE);- reporter.setEditableIssueFields(Lists.newArrayList("Type", "Priority"));+ ExcludeIssueFields allfieldsExcept = new ExcludeIssueFields();+ allfieldsExcept.getExcludeFields().add("Assignee");+ reporter.setEditableIssueFields(allfieldsExcept);jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");@@ -127,4 +132,43 @@ public class DefaultRoleManager extends AbstractEntityManager<Role> implements Rsave(reporter, null);}++ @Override+ public void onRenameIssueField(String oldName, String newName) {+ for (Role role: query()) {+ IssueFieldSet fieldSet = role.getEditableIssueFields();+ if (fieldSet instanceof ExcludeIssueFields) {+ ExcludeIssueFields allIssueFieldsExcept = (ExcludeIssueFields) fieldSet;+ if (allIssueFieldsExcept.getExcludeFields().remove(oldName))+ allIssueFieldsExcept.getExcludeFields().add(newName);+ if (allIssueFieldsExcept.getExcludeFields().isEmpty())+ role.setEditableIssueFields(new AllIssueFields());+ } else if (fieldSet instanceof IncludeIssueFields) {+ IncludeIssueFields specifiedIssueFields = (IncludeIssueFields) fieldSet;+ if (specifiedIssueFields.getIncludeFields().remove(oldName))+ specifiedIssueFields.getIncludeFields().add(newName);+ if (specifiedIssueFields.getIncludeFields().isEmpty())+ role.setEditableIssueFields(new NoneIssueFields());+ }+ }+ }++ @Override+ public void onDeleteIssueField(String fieldName) {+ for (Role role: query()) {+ IssueFieldSet fieldSet = role.getEditableIssueFields();+ if (fieldSet instanceof ExcludeIssueFields) {+ ExcludeIssueFields exludeIssueFields = (ExcludeIssueFields) fieldSet;+ exludeIssueFields.getExcludeFields().remove(fieldName);+ if (exludeIssueFields.getExcludeFields().isEmpty())+ role.setEditableIssueFields(new AllIssueFields());+ } else if (fieldSet instanceof IncludeIssueFields) {+ IncludeIssueFields includeIssueFields = (IncludeIssueFields) fieldSet;+ includeIssueFields.getIncludeFields().remove(fieldName);+ if (includeIssueFields.getIncludeFields().isEmpty())+ role.setEditableIssueFields(new NoneIssueFields());+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.javaindex 6939c25d43..74badb014a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java@@ -24,6 +24,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;+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;@@ -75,6 +76,9 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uproject.getIssueSetting().onRenameUser(oldName, user.getName());}+ for (JobExecutor jobExecutor: settingManager.getJobExecutors())+ jobExecutor.onRenameUser(oldName, user.getName());+issueFieldManager.onRenameUser(oldName, user.getName());settingManager.getIssueSetting().onRenameUser(oldName, user.getName());}@@ -109,6 +113,12 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uusage.add(project.getIssueSetting().onDeleteUser(user.getName()));usage.prefix("project '" + project.getName() + "': setting");}++ int index = 0;+ for (JobExecutor jobExecutor: settingManager.getJobExecutors()) {+ usage.add(jobExecutor.onDeleteUser(user.getName(), index).prefix("administration"));+ index++;+ }usage.add(settingManager.getIssueSetting().onDeleteUser(user.getName()).prefix("administration"));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 cbb3149001..dee48db03b 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@@ -5,9 +5,10 @@ import java.util.Date;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.model.Project;-import io.onedev.server.util.BuildCommitAware;+import io.onedev.server.util.CommitAware;+import io.onedev.server.util.ProjectAwareCommit;-public class RefUpdated extends ProjectEvent implements BuildCommitAware {+public class RefUpdated extends ProjectEvent implements CommitAware {private final String refName;@@ -15,6 +16,8 @@ public class RefUpdated extends ProjectEvent implements BuildCommitAware {private final ObjectId newCommitId;+ private transient ProjectAwareCommit commit;+public RefUpdated(Project project, String refName, ObjectId oldCommitId, ObjectId newCommitId) {super(null, new Date(), project);this.refName = refName;@@ -35,8 +38,10 @@ public class RefUpdated extends ProjectEvent implements BuildCommitAware {}@Override- public ObjectId getBuildCommit() {- return newCommitId;+ public ProjectAwareCommit getCommit() {+ if (commit == null)+ commit = new ProjectAwareCommit(getProject(), newCommitId);+ return commit;}}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 27e2e4a0a3..5d1bd0b218 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@@ -7,9 +7,10 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.event.ProjectEvent;import io.onedev.server.model.Build;import io.onedev.server.model.User;-import io.onedev.server.util.BuildCommitAware;+import io.onedev.server.util.CommitAware;+import io.onedev.server.util.ProjectAwareCommit;-public class BuildEvent extends ProjectEvent implements BuildCommitAware {+public class BuildEvent extends ProjectEvent implements CommitAware {private Build build;@@ -27,8 +28,8 @@ public class BuildEvent extends ProjectEvent implements BuildCommitAware {}@Override- public ObjectId getBuildCommit() {- return ObjectId.fromString(build.getCommitHash());+ public ProjectAwareCommit getCommit() {+ return new ProjectAwareCommit(build.getProject(), ObjectId.fromString(build.getCommitHash()));}}diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildRetrying.java b/server-core/src/main/java/io/onedev/server/event/build/BuildRetrying.javanew file mode 100644index 0000000000..d69172e056--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildRetrying.java@@ -0,0 +1,11 @@+package io.onedev.server.event.build;++import io.onedev.server.model.Build;++public class BuildRetrying extends BuildEvent {++ public BuildRetrying(Build build) {+ super(build.getSubmitter(), build.getRetryDate(), build);+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommitted.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommitted.javadeleted file mode 100644index 575c06930d..0000000000--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommitted.java+++ /dev/null@@ -1,28 +0,0 @@-package io.onedev.server.event.issue;--import java.util.Date;-import java.util.List;--import org.eclipse.jgit.lib.ObjectId;--import io.onedev.server.model.Issue;--public class IssueCommitted extends IssueEvent {-- private final List<ObjectId> fixCommits;-- public IssueCommitted(Issue issue, List<ObjectId> fixCommits) {- super(null, new Date(), issue);- this.fixCommits = fixCommits;- }-- @Override- public boolean affectsBoards() {- return false;- }-- public List<ObjectId> getFixCommits() {- return fixCommits;- }--}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.javaindex fc2f4253c6..c1888d25b3 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java@@ -41,15 +41,12 @@ import com.google.common.base.Preconditions;import com.google.common.base.Splitter;import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.PathUtils;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.entity.EntityRemoved;-import io.onedev.server.event.issue.IssueCommitted;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.git.Contribution;import io.onedev.server.git.Contributor;@@ -61,7 +58,6 @@ import io.onedev.server.git.command.ListNumStatsCommand;import io.onedev.server.git.command.LogCommand;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.git.command.RevListCommand.Order;-import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.persistence.SessionManager;@@ -282,10 +278,6 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemeprivate final SessionManager sessionManager;- private final ListenerRegistry listenerRegistry;-- private final IssueManager issueManager;-private final Map<Long, List<String>> filesCache = new ConcurrentHashMap<>();private final Map<Long, Integer> totalCommitCountCache = new ConcurrentHashMap<>();@@ -294,14 +286,11 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme@Injectpublic DefaultCommitInfoManager(ProjectManager projectManager, StorageManager storageManager,- BatchWorkManager batchWorkManager, SessionManager sessionManager,- ListenerRegistry listenerRegistry, IssueManager issueManager) {+ BatchWorkManager batchWorkManager, SessionManager sessionManager) {this.projectManager = projectManager;this.storageManager = storageManager;this.batchWorkManager = batchWorkManager;this.sessionManager = sessionManager;- this.listenerRegistry = listenerRegistry;- this.issueManager = issueManager;}private boolean isCommitCollected(byte[] commitBytes) {@@ -329,8 +318,6 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemeRepository repository = project.getRepository();- Map<Long, List<ObjectId>> fixedIssueNumbers = new HashMap<>();-Pair<byte[], ObjectId> result = env.computeInTransaction(new TransactionalComputable<Pair<byte[], ObjectId>>() {@Override@@ -495,27 +482,13 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemeObjectId fixCommit = it.next();if (GitUtils.isMergedInto(project.getRepository(), null, fixCommit, currentCommitId)) {it.remove();- Collection<ObjectId> newFixingCommits = fixedIssueNumbers.get(issueNumber);- if (newFixingCommits != null) {- newFixingCommits.remove(fixCommit);- if (newFixingCommits.isEmpty())- fixedIssueNumbers.remove(issueNumber);- }-} else if (GitUtils.isMergedInto(project.getRepository(), null, currentCommitId, fixCommit)) {addNextCommit = false;break;}}- if (addNextCommit) {+ if (addNextCommit)fixingCommits.add(currentCommitId);- List<ObjectId> newFixingCommits = fixedIssueNumbers.get(issueNumber);- if (newFixingCommits == null) {- newFixingCommits = new ArrayList<>();- fixedIssueNumbers.put(issueNumber, newFixingCommits);- }- newFixingCommits.add(currentCommitId);- }writeCommits(fixCommitsStore, txn, issueKey, fixingCommits);}@@ -761,12 +734,6 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme}}- for (Map.Entry<Long, List<ObjectId>> entry: fixedIssueNumbers.entrySet()) {- Issue issue = issueManager.find(project, entry.getKey());- if (issue != null)- listenerRegistry.post(new IssueCommitted(issue, entry.getValue()));- }-logger.debug("Collected commit information (project: {}, ref: {})", project.getName(), refName);}diff --git a/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/issue/BoardSpec.javaindex 67d31e96d9..515c04af45 100644--- a/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java@@ -26,7 +26,6 @@ import io.onedev.server.issue.fieldspec.UserChoiceField;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.util.EditContext;-import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.util.query.IssueQueryConstants;@@ -70,7 +69,8 @@ public class BoardSpec implements Serializable {}@Editable(order=200, description="Optionally specify a base query to filter/order issues of the board")- @IssueQuery(withCurrentUserCriteria = true, withCurrentBuildCriteria = false)+ @IssueQuery(withCurrentUserCriteria = true, withCurrentBuildCriteria = false,+ withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = false)@Nullablepublic String getBaseQuery() {return baseQuery;@@ -82,7 +82,8 @@ public class BoardSpec implements Serializable {@Editable(order=250, description="Optionally specify a base query to filter/order issues in backlog. "+ "Backlog issues are those not associating with any milestones")- @IssueQuery(withCurrentUserCriteria = true, withCurrentBuildCriteria = false)+ @IssueQuery(withCurrentUserCriteria = true, withCurrentBuildCriteria = false,+ withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = false)@Nullablepublic String getBacklogBaseQuery() {return backlogBaseQuery;@@ -187,15 +188,23 @@ public class BoardSpec implements Serializable {return -1;}- public Set<String> getUndefinedStates(Project project) {+ private Set<String> getUndefinedStates(Project project, @Nullable String query) {Set<String> undefinedStates = new HashSet<>();- if (getBaseQuery() != null) {+ if (query != null) {try {undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(- project, getBaseQuery(), false, true, true).getUndefinedStates());+ project, query, false, true, true, true, true).getUndefinedStates());} catch (Exception e) {}}+ return undefinedStates;+ }++ public Set<String> getUndefinedStates(Project project) {+ Set<String> undefinedStates = new HashSet<>();+ undefinedStates.addAll(getUndefinedStates(project, getBaseQuery()));+ undefinedStates.addAll(getUndefinedStates(project, getBacklogBaseQuery()));+if (getIdentifyField().equals(IssueQueryConstants.FIELD_STATE)) {for (String column: getColumns()) {if (getIssueSetting().getStateSpec(column) == null)@@ -205,17 +214,24 @@ public class BoardSpec implements Serializable {return undefinedStates;}- public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {- if (getBaseQuery() != null) {+ private String fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions,+ @Nullable String query) {+ if (query != null) {try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false, true, true);+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())- query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());- setBaseQuery(query.toString());+ parsedQuery.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());+ return parsedQuery.toString();} catch (Exception e) {}}+ return query;+ }++ public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {+ setBaseQuery(fixUndefinedStates(project, resolutions, getBaseQuery()));+ setBacklogBaseQuery(fixUndefinedStates(project, resolutions, getBacklogBaseQuery()));if (getIdentifyField().equals(IssueQueryConstants.FIELD_STATE)) {for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {int index = getColumns().indexOf(entry.getKey());@@ -228,16 +244,23 @@ public class BoardSpec implements Serializable {}}}-- public Set<String> getUndefinedFields(Project project) {++ private Set<String> getUndefinedFields(Project project, @Nullable String query) {Set<String> undefinedFields = new HashSet<>();- if (getBaseQuery() != null) {+ if (query != null) {try {undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery- .parse(project, getBaseQuery(), false, true, true).getUndefinedFields());+ .parse(project, query, false, true, true, true, true).getUndefinedFields());} catch (Exception e) {}}+ return undefinedFields;+ }++ public Set<String> getUndefinedFields(Project project) {+ Set<String> undefinedFields = new HashSet<>();+ undefinedFields.addAll(getUndefinedFields(project, getBaseQuery()));+ undefinedFields.addAll(getUndefinedFields(project, getBacklogBaseQuery()));if (!IssueQueryConstants.FIELD_STATE.equals(getIdentifyField())) {FieldSpec fieldSpec = getIssueSetting().getFieldSpec(getIdentifyField());if (fieldSpec == null)@@ -252,29 +275,33 @@ public class BoardSpec implements Serializable {}return undefinedFields;}-- public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {- if (getBaseQuery() != null) {++ @Nullable+ private String fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions, @Nullable String query) {+ if (query != null) {try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false, true, true);+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, query, false, true, true, true, true);boolean remove = false;for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {UndefinedFieldResolution resolution = entry.getValue();if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {- query.onRenameField(entry.getKey(), resolution.getNewField());- } else if (query.onDeleteField(entry.getKey())) {+ parsedQuery.onRenameField(entry.getKey(), resolution.getNewField());+ } else if (parsedQuery.onDeleteField(entry.getKey())) {remove = true;break;}- }- if (remove)- setBaseQuery(null);- else- setBaseQuery(query.toString());+ }+ return remove?null:parsedQuery.toString();} catch (Exception e) {}}+ return query;+ }++ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {+ setBaseQuery(fixUndefinedFields(resolutions, getBaseQuery()));+ setBacklogBaseQuery(fixUndefinedFields(resolutions, getBacklogBaseQuery()));for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {UndefinedFieldResolution resolution = entry.getValue();@@ -297,9 +324,9 @@ public class BoardSpec implements Serializable {return false;}- public boolean fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {+ public boolean fixUndefinedFieldValues(@Nullable Project project, Map<String, ValueSetEdit> valueSetEdits) {for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {- if (onEditFieldValues(entry.getKey(), entry.getValue()))+ if (onEditFieldValues(project, entry.getKey(), entry.getValue()))return true;}return false;@@ -319,8 +346,7 @@ public class BoardSpec implements Serializable {}}- @Nullable- public Usage onDeleteUser(GlobalIssueSetting issueSetting, String userName) {+ public boolean onDeleteUser(GlobalIssueSetting issueSetting, String userName) {FieldSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());if (fieldSpec instanceof UserChoiceField) {for (Iterator<String> it = getColumns().iterator(); it.hasNext();) {@@ -329,12 +355,26 @@ public class BoardSpec implements Serializable {}}if (getColumns().size() < 2)- return null;+ return true;else- return new Usage();+ return false;+ }++ @Nullable+ private String onRenameField(String oldName, String newName, @Nullable String query) {+ if (query != null) {+ try {+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, query, false, true, true, true, true);+ parsedQuery.onRenameField(oldName, newName);+ return parsedQuery.toString();+ } catch (Exception e) {+ }+ }+ return query;}- public void onRenameField(GlobalIssueSetting issueSetting, String oldName, String newName) {+ public void onRenameField(String oldName, String newName) {if (getIdentifyField().equals(oldName))setIdentifyField(newName);int index = getDisplayFields().indexOf(oldName);@@ -344,26 +384,24 @@ public class BoardSpec implements Serializable {elsegetDisplayFields().set(index, newName);}- if (getBaseQuery() != null) {- try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false, true, true);- query.onRenameField(oldName, newName);- setBaseQuery(query.toString());- } catch (Exception e) {- }- }- if (getBacklogBaseQuery() != null) {+ setBaseQuery(onRenameField(oldName, newName, getBaseQuery()));+ setBacklogBaseQuery(onRenameField(oldName, newName, getBacklogBaseQuery()));+ }++ @Nullable+ private String onRenameState(String oldName, String newName, @Nullable String query) {+ if (query != null) {try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false, true, true);- query.onRenameField(oldName, newName);- setBacklogBaseQuery(query.toString());+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, query, false, true, true, true, true);+ parsedQuery.onRenameState(oldName, newName);+ return parsedQuery.toString();} catch (Exception e) {}}+ return query;}-+public void onRenameState(String oldName, String newName) {if (getIdentifyField().equals(IssueQueryConstants.FIELD_STATE)) {int index = getColumns().indexOf(oldName);@@ -375,85 +413,75 @@ public class BoardSpec implements Serializable {}}- if (getBaseQuery() != null) {- try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false, true, true);- query.onRenameState(oldName, newName);- setBaseQuery(query.toString());- } catch (Exception e) {- }- }- if (getBacklogBaseQuery() != null) {- try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false, true, true);- query.onRenameState(oldName, newName);- setBacklogBaseQuery(query.toString());- } catch (Exception e) {- }- }-+ setBaseQuery(onRenameState(oldName, newName, getBaseQuery()));+ setBacklogBaseQuery(onRenameState(oldName, newName, getBacklogBaseQuery()));}- public boolean onDeleteField(GlobalIssueSetting issueSetting, String fieldName) {- getDisplayFields().remove(fieldName);- if (getBaseQuery() != null) {+ @Nullable+ private String onDeleteField(String fieldName, @Nullable String query) {+ if (query != null) {try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false, true, true);- if (query.onDeleteField(fieldName))- setBaseQuery(null);+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, query, false, true, true, true, true);+ if (parsedQuery.onDeleteField(fieldName))+ return null;else- setBaseQuery(query.toString());+ return parsedQuery.toString();} catch (Exception e) {}}- if (getBacklogBaseQuery() != null) {+ return query;+ }++ public boolean onDeleteField(String fieldName) {+ getDisplayFields().remove(fieldName);+ setBaseQuery(onDeleteField(fieldName, getBaseQuery()));+ setBacklogBaseQuery(onDeleteField(fieldName, getBacklogBaseQuery()));+ return getIdentifyField().equals(fieldName);+ }++ @Nullable+ private String onDeleteState(String stateName, @Nullable String query) {+ if (query != null) {try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false, true, true);- if (query.onDeleteField(fieldName))- setBacklogBaseQuery(null);+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, query, false, true, true, true, true);+ if (parsedQuery.onDeleteState(stateName))+ return null;else- setBacklogBaseQuery(query.toString());+ return parsedQuery.toString();} catch (Exception e) {}}-- return getIdentifyField().equals(fieldName);+ return query;}-+public boolean onDeleteState(String stateName) {if (getIdentifyField().equals(IssueQueryConstants.FIELD_STATE))getColumns().remove(stateName);- if (getBaseQuery() != null) {- try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false, true, true);- if (query.onDeleteState(stateName))- setBaseQuery(null);- else- setBaseQuery(query.toString());- } catch (Exception e) {- }- }- if (getBacklogBaseQuery() != null) {+ setBaseQuery(onDeleteState(stateName, getBaseQuery()));+ setBacklogBaseQuery(onDeleteState(stateName, getBacklogBaseQuery()));++ return getColumns().size() < 2;+ }++ @Nullable+ private String onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit, @Nullable String query) {+ if (query != null) {try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false, true, true);- if (query.onDeleteState(stateName))- setBacklogBaseQuery(null);+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, query, false, true, true, true, true);+ if (parsedQuery.onEditFieldValues(fieldName, valueSetEdit))+ return null;else- setBacklogBaseQuery(query.toString());+ return parsedQuery.toString();} catch (Exception e) {}}-- return getColumns().size() < 2;+ return query;}-- public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {++ public boolean onEditFieldValues(@Nullable Project project, String fieldName, ValueSetEdit valueSetEdit) {if (fieldName.equals(getIdentifyField())) {getColumns().removeAll(valueSetEdit.getDeletions());for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {@@ -466,32 +494,25 @@ public class BoardSpec implements Serializable {}}}- if (getBaseQuery() != null) {- try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false, true, true);- if (query.onEditFieldValues(fieldName, valueSetEdit))- setBaseQuery(null);- else- setBaseQuery(query.toString());- } catch (Exception e) {- }- }- if (getBacklogBaseQuery() != null) {+ setBaseQuery(onEditFieldValues(fieldName, valueSetEdit, getBaseQuery()));+ setBacklogBaseQuery(onEditFieldValues(fieldName, valueSetEdit, getBacklogBaseQuery()));+ return getColumns().size() < 2;+ }++ private Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project, @Nullable String query) {+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();+ if (query != null) {try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false, true, true);- if (query.onEditFieldValues(fieldName, valueSetEdit))- setBacklogBaseQuery(null);- else- setBacklogBaseQuery(query.toString());+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);+ undefinedFieldValues.addAll(parsedQuery.getUndefinedFieldValues());} catch (Exception e) {}}- return getColumns().size() < 2;+ return undefinedFieldValues;}-- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {++ public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();if (!identifyField.equals(IssueQueryConstants.FIELD_STATE)) {SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(identifyField));@@ -502,22 +523,8 @@ public class BoardSpec implements Serializable {}}}- if (getBaseQuery() != null) {- try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false, true, true);- undefinedFieldValues.addAll(query.getUndefinedFieldValues());- } catch (Exception e) {- }- }- if (getBacklogBaseQuery() != null) {- try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false, true, true);- undefinedFieldValues.addAll(query.getUndefinedFieldValues());- } catch (Exception e) {- }- }+ undefinedFieldValues.addAll(getUndefinedFieldValues(project, getBaseQuery()));+ undefinedFieldValues.addAll(getUndefinedFieldValues(project, getBacklogBaseQuery()));return undefinedFieldValues;}diff --git a/server-core/src/main/java/io/onedev/server/issue/TransitionSpec.java b/server-core/src/main/java/io/onedev/server/issue/TransitionSpec.javaindex 44d13d18e9..534b2fbe62 100644--- a/server-core/src/main/java/io/onedev/server/issue/TransitionSpec.java+++ b/server-core/src/main/java/io/onedev/server/issue/TransitionSpec.java@@ -8,6 +8,7 @@ import java.util.Iterator;import java.util.List;import java.util.Map;+import javax.annotation.Nullable;import javax.validation.constraints.NotNull;import javax.validation.constraints.Size;@@ -17,18 +18,14 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.issue.fieldspec.FieldSpec;-import io.onedev.server.issue.transitionprerequisite.TransitionPrerequisite;-import io.onedev.server.issue.transitionprerequisite.ValueIsNotAnyOf;-import io.onedev.server.issue.transitionprerequisite.ValueIsOneOf;-import io.onedev.server.issue.transitionprerequisite.ValueMatcher;+import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.issue.transitiontrigger.TransitionTrigger;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.util.Input;+import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution.FixType;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;@@ -46,8 +43,6 @@ public class TransitionSpec implements Serializable {private String toState;- private TransitionPrerequisite prerequisite;-private TransitionTrigger trigger;private List<String> removeFields = new ArrayList<>();@@ -74,17 +69,6 @@ public class TransitionSpec implements Serializable {this.toState = toState;}- @Editable(order=300, description="Enable if applicability of this transition depends on "- + "value of particular field")- @NameOfEmptyValue("No prerequisite")- public TransitionPrerequisite getPrerequisite() {- return prerequisite;- }-- public void setPrerequisite(TransitionPrerequisite prerequisite) {- this.prerequisite = prerequisite;- }-@Editable(order=400, name="Do Transition When")@NotNull(message="may not be empty")public TransitionTrigger getTrigger() {@@ -115,7 +99,7 @@ public class TransitionSpec implements Serializable {}public Usage onDeleteBranch(String branchName) {- return getTrigger().onDeleteBranch(branchName).prefix("transitions: " + fromStates + "->" + toState);+ return getTrigger().onDeleteBranch(branchName).prefix("trigger");}public void onRenameRole(String oldName, String newName) {@@ -123,7 +107,7 @@ public class TransitionSpec implements Serializable {}public Usage onDeleteRole(String roleName) {- return trigger.onDeleteRole(roleName).prefix("transitions: " + fromStates + "->" + toState);+ return trigger.onDeleteRole(roleName).prefix("trigger");}public void onRenameState(String oldName, String newName) {@@ -140,8 +124,6 @@ public class TransitionSpec implements Serializable {}public void onRenameField(String oldName, String newName) {- if (getPrerequisite() != null && getPrerequisite().getInputName().equals(oldName))- getPrerequisite().setInputName(newName);int index = getRemoveFields().indexOf(oldName);if (index != -1) {if (getRemoveFields().contains(newName))@@ -153,9 +135,6 @@ public class TransitionSpec implements Serializable {}public boolean onDeleteField(String fieldName) {- if (getPrerequisite() != null && getPrerequisite().getInputName().equals(fieldName))- setPrerequisite(null);-if (getTrigger().onDeleteField(fieldName))return true;@@ -178,8 +157,6 @@ public class TransitionSpec implements Serializable {public Collection<String> getUndefinedFields(Project project) {Collection<String> undefinedFields = new HashSet<>();GlobalIssueSetting setting = OneDev.getInstance(SettingManager.class).getIssueSetting();- if (getPrerequisite() != null && setting.getFieldSpec(getPrerequisite().getInputName()) == null)- undefinedFields.add(getPrerequisite().getInputName());undefinedFields.addAll(getTrigger().getUndefinedFields());for (String field: getRemoveFields()) {if (setting.getFieldSpec(field) == null)@@ -199,37 +176,6 @@ public class TransitionSpec implements Serializable {}public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {- if (getPrerequisite() != null && getPrerequisite().getInputName().equals(fieldName)) {- if (getPrerequisite().getValueMatcher() instanceof ValueIsOneOf) {- ValueIsOneOf valueIsOneOf = (ValueIsOneOf) getPrerequisite().getValueMatcher();- valueIsOneOf.getValues().removeAll(valueSetEdit.getDeletions());- for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {- int index = valueIsOneOf.getValues().indexOf(entry.getKey());- if (index != -1) {- if (valueIsOneOf.getValues().contains(entry.getValue()))- valueIsOneOf.getValues().remove(index);- else- valueIsOneOf.getValues().set(index, entry.getValue());- }- }- if (valueIsOneOf.getValues().isEmpty())- setPrerequisite(null);- } else if (getPrerequisite().getValueMatcher() instanceof ValueIsNotAnyOf) {- ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) getPrerequisite().getValueMatcher();- valueIsNotAnyOf.getValues().removeAll(valueSetEdit.getDeletions());- for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {- int index = valueIsNotAnyOf.getValues().indexOf(entry.getKey());- if (index != -1) {- if (valueIsNotAnyOf.getValues().contains(entry.getValue()))- valueIsNotAnyOf.getValues().remove(index);- else- valueIsNotAnyOf.getValues().set(index, entry.getValue());- }- }- if (valueIsNotAnyOf.getValues().isEmpty())- setPrerequisite(null);- }- }return trigger.onEditFieldValues(fieldName, valueSetEdit);}@@ -254,19 +200,15 @@ public class TransitionSpec implements Serializable {return StringUtils.join(getFromStates()) + "-->" + getToState();}- public boolean canTransite(Issue issue) {- if (getFromStates().contains(issue.getState())) {- if (getPrerequisite() == null) {- return true;- } else {- Input field = issue.getFieldInputs().get(getPrerequisite().getInputName());- List<String> fieldValues;- if (field != null)- fieldValues = field.getValues();- else- fieldValues = new ArrayList<>();- if (getPrerequisite().matches(fieldValues))- return true;+ public boolean canTransitManually(Issue issue, @Nullable String toState) {+ if (getFromStates().contains(issue.getState())+ && (toState == null || toState.equals(getToState()))+ && getTrigger() instanceof PressButtonTrigger) {+ PressButtonTrigger pressButton = (PressButtonTrigger) getTrigger();+ if (pressButton.isAuthorized(issue.getProject())) {+ IssueQuery parsedQuery = IssueQuery.parse(issue.getProject(),+ getTrigger().getIssueQuery(), true, true, true, true, true);+ return parsedQuery.matches(issue);}}return false;@@ -277,28 +219,7 @@ public class TransitionSpec implements Serializable {}public Collection<UndefinedFieldValue> getUndefinedFieldValues() {- Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();- if (prerequisite != null) {- ValueMatcher valueMatcher = prerequisite.getValueMatcher();- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(prerequisite.getInputName()));- if (specifiedChoices != null) {- if (valueMatcher instanceof ValueIsOneOf) {- ValueIsOneOf valueIsOneOf = (ValueIsOneOf) valueMatcher;- for (String value: valueIsOneOf.getValues()) {- if (!specifiedChoices.getChoiceValues().contains(value))- undefinedFieldValues.add(new UndefinedFieldValue(prerequisite.getInputName(), value));- }- } else if (valueMatcher instanceof ValueIsNotAnyOf) {- ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) valueMatcher;- for (String value: valueIsNotAnyOf.getValues()) {- if (!specifiedChoices.getChoiceValues().contains(value))- undefinedFieldValues.add(new UndefinedFieldValue(prerequisite.getInputName(), value));- }- }- }- }- undefinedFieldValues.addAll(trigger.getUndefinedFieldValues());- return undefinedFieldValues;+ return trigger.getUndefinedFieldValues();}public Collection<? extends String> getUndefinedStates() {diff --git a/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/TransitionPrerequisite.java b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/TransitionPrerequisite.javadeleted file mode 100644index 2b90c053d6..0000000000--- a/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/TransitionPrerequisite.java+++ /dev/null@@ -1,63 +0,0 @@-package io.onedev.server.issue.transitionprerequisite;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import javax.validation.constraints.NotNull;--import org.hibernate.validator.constraints.NotEmpty;--import com.google.common.base.Preconditions;--import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.web.editable.annotation.ChoiceProvider;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.OmitName;--@Editable-public class TransitionPrerequisite implements Serializable {-- private static final long serialVersionUID = 1L;-- private String inputName;-- private ValueMatcher valueMatcher;-- @Editable(order=100, name="When field")- @ChoiceProvider("getFieldNameChoices")- @NotEmpty- public String getInputName() {- return inputName;- }-- public void setInputName(String fieldName) {- this.inputName = fieldName;- }-- @Editable(order=200)- @NotNull- @OmitName- public ValueMatcher getValueMatcher() {- return valueMatcher;- }-- public void setValueMatcher(ValueMatcher valueMatcher) {- this.valueMatcher = valueMatcher;- }-- @SuppressWarnings("unused")- private static List<String> getFieldNameChoices() {- return new ArrayList<>(Preconditions.checkNotNull(InputContext.get()).getInputNames());- }-- public boolean matches(List<String> values) {- if (values.isEmpty())- return valueMatcher.matches(null);- else if (values.size() == 1)- return valueMatcher.matches(values.iterator().next());- else- throw new IllegalStateException("Transition prerequisite should not be based on a multi-value input");- }--}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsEmpty.java b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsEmpty.javadeleted file mode 100644index ffd667fcb2..0000000000--- a/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsEmpty.java+++ /dev/null@@ -1,15 +0,0 @@-package io.onedev.server.issue.transitionprerequisite;--import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=400, name="is empty")-public class ValueIsEmpty implements ValueMatcher {-- private static final long serialVersionUID = 1L;-- @Override- public boolean matches(String value) {- return value == null;- }--}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsNotAnyOf.java b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsNotAnyOf.javadeleted file mode 100644index 6e57aa2077..0000000000--- a/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsNotAnyOf.java+++ /dev/null@@ -1,60 +0,0 @@-package io.onedev.server.issue.transitionprerequisite;--import java.util.List;--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.EditContext;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.web.editable.annotation.ChoiceProvider;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.OmitName;--@Editable(order=200, name="does not have any value of")-public class ValueIsNotAnyOf implements ValueMatcher {-- private static final long serialVersionUID = 1L;-- private static final Logger logger = LoggerFactory.getLogger(ValueIsNotAnyOf.class);-- private List<String> values;-- @Editable- @ChoiceProvider("getValueChoices")- @OmitName- @Size(min=1, message="At least one value needs to be specified")- public List<String> getValues() {- return values;- }-- public void setValues(List<String> values) {- this.values = values;- }-- @SuppressWarnings("unused")- private static List<String> getValueChoices() {- // Access on-screen value of ShowCondition.fiedName- String inputName = (String) EditContext.get(1).getInputValue("inputName");- if (inputName != null) {- InputSpec fieldSpec = Preconditions.checkNotNull(InputContext.get()).getInputSpec(inputName);- if (fieldSpec != null)- return fieldSpec.getPossibleValues();- else- logger.error("Unable to find field spec: " + inputName);- }- return Lists.newArrayList();- }-- @Override- public boolean matches(String value) {- return !getValues().contains(value);- }--}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsNotEmpty.java b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsNotEmpty.javadeleted file mode 100644index 337429902c..0000000000--- a/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsNotEmpty.java+++ /dev/null@@ -1,15 +0,0 @@-package io.onedev.server.issue.transitionprerequisite;--import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=300, name="is not empty")-public class ValueIsNotEmpty implements ValueMatcher {-- private static final long serialVersionUID = 1L;-- @Override- public boolean matches(String value) {- return value != null;- }--}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsOneOf.java b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsOneOf.javadeleted file mode 100644index 15607f772e..0000000000--- a/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsOneOf.java+++ /dev/null@@ -1,60 +0,0 @@-package io.onedev.server.issue.transitionprerequisite;--import java.util.List;--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.EditContext;-import io.onedev.server.util.inputspec.InputContext;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.web.editable.annotation.ChoiceProvider;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.OmitName;--@Editable(order=100, name="has any value of")-public class ValueIsOneOf implements ValueMatcher {-- private static final long serialVersionUID = 1L;-- private static final Logger logger = LoggerFactory.getLogger(ValueIsOneOf.class);-- private List<String> values;-- @Editable- @ChoiceProvider("getValueChoices")- @OmitName- @Size(min=1, message="At least one value needs to be specified")- public List<String> getValues() {- return values;- }-- public void setValues(List<String> values) {- this.values = values;- }-- @SuppressWarnings("unused")- private static List<String> getValueChoices() {- // Access on-screen value of ShowCondition.fiedName- String inputName = (String) EditContext.get(1).getInputValue("inputName");- if (inputName != null) {- InputSpec inputSpec = Preconditions.checkNotNull(InputContext.get()).getInputSpec(inputName);- if (inputSpec != null)- return inputSpec.getPossibleValues();- else- logger.error("Unable to find field spec: " + inputName);- }- return Lists.newArrayList();- }-- @Override- public boolean matches(String value) {- return getValues().contains(value);- }--}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueMatcher.java b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueMatcher.javadeleted file mode 100644index ad9b81b56f..0000000000--- a/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueMatcher.java+++ /dev/null@@ -1,12 +0,0 @@-package io.onedev.server.issue.transitionprerequisite;--import java.io.Serializable;--import io.onedev.server.web.editable.annotation.Editable;--@Editable-public interface ValueMatcher extends Serializable {-- boolean matches(String value);--}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/CommitTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BranchUpdateTrigger.javasimilarity index 51%rename from server-core/src/main/java/io/onedev/server/issue/transitiontrigger/CommitTrigger.javarename to server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BranchUpdateTrigger.javaindex 15a3c6c730..3b65a7f874 100644--- a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/CommitTrigger.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BranchUpdateTrigger.java@@ -3,20 +3,29 @@ package io.onedev.server.issue.transitiontrigger;import java.util.ArrayList;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.search.entity.issue.IssueQueryLexer;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.IssueQuery;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=500, name="Issue is committed")-public class CommitTrigger extends TransitionTrigger {+@Editable(order=500, name="Commit to branch")+public class BranchUpdateTrigger extends TransitionTrigger {private static final long serialVersionUID = 1L;private String branches;+ public BranchUpdateTrigger() {+ setIssueQuery(io.onedev.server.search.entity.issue.IssueQuery+ .getRuleName(IssueQueryLexer.FixedInCurrentCommit));+ }+@Editable(order=200, name="Applicable Branches", description="Optionally specify space-separated branches "+ "applicable for this trigger. Use * or ? for wildcard match")@Patterns(suggester = "suggestBranches")@@ -37,5 +46,26 @@ public class CommitTrigger extends TransitionTrigger {elsereturn new ArrayList<>();}++ @Editable(order=1000, name="Applicable Issues", description="Specify criteria of issues applicable for this transition")+ @IssueQuery(withOrder = false, withCurrentUserCriteria = false, withCurrentBuildCriteria = false,+ withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = true)+ @NotEmpty+ @Override+ public String getIssueQuery() {+ return super.getIssueQuery();+ }++ public void setIssueQuery(String issueQuery) {+ super.setIssueQuery(issueQuery);+ }++ @Override+ public String getDescription() {+ if (branches != null)+ return "Committed to branches '" + branches + "'";+ else+ return "Committed to any branch";+ }}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BuildSuccessfulTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BuildSuccessfulTrigger.javaindex bc8640c0b2..41aa29b49d 100644--- a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BuildSuccessfulTrigger.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BuildSuccessfulTrigger.java@@ -1,18 +1,15 @@package io.onedev.server.issue.transitiontrigger;import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;import java.util.List;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Project;+import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.util.Usage;-import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.IssueQuery;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -28,7 +25,10 @@ public class BuildSuccessfulTrigger extends TransitionTrigger {private String branches;- private String issueQuery = "fixed in current build";+ public BuildSuccessfulTrigger() {+ setIssueQuery(io.onedev.server.search.entity.issue.IssueQuery+ .getRuleName(IssueQueryLexer.FixedInCurrentBuild));+ }@Editable(order=100, name="Applicable Jobs", description="Optionally specify space-separated jobs "+ "applicable for this trigger. Use * or ? for wildcard match")@@ -72,124 +72,40 @@ public class BuildSuccessfulTrigger extends TransitionTrigger {return new ArrayList<>();}- @Editable(order=300, description="Specify an issue query to filter issues eligible for this transition."- + "This query will be combined with 'from states' criteria of this transition")- @IssueQuery(withCurrentUserCriteria = false, withCurrentBuildCriteria = true)+ @Editable(order=1000, name="Applicable Issues", description="Specify criteria of issues applicable for this transition")+ @IssueQuery(withOrder = false, withCurrentUserCriteria = false, withCurrentBuildCriteria = true,+ withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = false)@NotEmpty+ @Overridepublic String getIssueQuery() {- return issueQuery;+ return super.getIssueQuery();}public void setIssueQuery(String issueQuery) {- this.issueQuery = issueQuery;+ super.setIssueQuery(issueQuery);}@Overridepublic Usage onDeleteBranch(String branchName) {- Usage usage = new Usage();- PatternSet patternSet = PatternSet.fromString(getBranches());+ Usage usage = super.onDeleteBranch(branchName);+ PatternSet patternSet = PatternSet.parse(getBranches());if (patternSet.getIncludes().contains(branchName) || patternSet.getExcludes().contains(branchName))usage.add("applicable branches");- return usage.prefix("build successful trigger");- }-- @Override- public void onRenameState(String oldName, String newName) {- try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true);- query.onRenameState(oldName, newName);- issueQuery = query.toString();- } catch (Exception e) {- }- }-- @Override- public boolean onDeleteState(String stateName) {- try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true);- if (query.onDeleteState(stateName)) {- return true;- } else {- issueQuery = query.toString();- return false;- }- } catch (Exception e) {- return false;- }- }-- @Override- public void onRenameField(String oldName, String newName) {- try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true);- query.onRenameField(oldName, newName);- issueQuery = query.toString();- } catch (Exception e) {- }- }-- @Override- public boolean onDeleteField(String fieldName) {- try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true);- if (query.onDeleteField(fieldName)) {- return true;- } else {- issueQuery = query.toString();- return false;- }- } catch (Exception e) {- return false;- }- }-- @Override- public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {- try {- io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true);- if (query.onEditFieldValues(fieldName, valueSetEdit)) {- return true;- } else {- issueQuery = query.toString();- return false;- }- } catch (Exception e) {- return false;- }- }-- @Override- public Collection<String> getUndefinedStates() {- try {- return io.onedev.server.search.entity.issue.IssueQuery- .parse(null, issueQuery, false, true, true).getUndefinedStates();- } catch (Exception e) {- return new HashSet<>();- }- }-- @Override- public Collection<String> getUndefinedFields() {- try {- return io.onedev.server.search.entity.issue.IssueQuery- .parse(null, issueQuery, false, true, true).getUndefinedFields();- } catch (Exception e) {- return new HashSet<>();- }+ return usage;}-+@Override- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {- try {- return io.onedev.server.search.entity.issue.IssueQuery- .parse(null, issueQuery, false, true, true).getUndefinedFieldValues();- } catch (Exception e) {- return new HashSet<>();+ public String getDescription() {+ if (jobNames != null) {+ if (branches != null)+ return "Build is successful for jobs '" + jobNames + "' on branches '" + branches + "'";+ else+ return "Build is successful for jobs '" + jobNames + "' on any branch";+ } else {+ if (branches != null)+ return "Build is successful for any job on branches '" + branches + "'";+ else+ return "Build is successful for any job and branch";}}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/DiscardPullRequest.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/DiscardPullRequest.javaindex 06c98e3cf2..0739da34dd 100644--- a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/DiscardPullRequest.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/DiscardPullRequest.java@@ -2,9 +2,17 @@ package io.onedev.server.issue.transitiontrigger;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=300, name="Pull request fixing the issue is discarded")+@Editable(order=300, name="Pull request is discarded")public class DiscardPullRequest extends PullRequestTrigger {private static final long serialVersionUID = 1L;+ @Override+ public String getDescription() {+ if (getBranches() != null)+ return "Pull request to branches '" + getBranches() + "' is discarded";+ else+ return "Pull request to any branch is discarded";+ }+}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/MergePullRequest.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/MergePullRequest.javaindex 51e6b40a19..9d0c1c9667 100644--- a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/MergePullRequest.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/MergePullRequest.java@@ -2,9 +2,17 @@ package io.onedev.server.issue.transitiontrigger;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=250, name="Pull request fixing the issue is merged")+@Editable(order=250, name="Pull request is merged")public class MergePullRequest extends PullRequestTrigger {private static final long serialVersionUID = 1L;+ @Override+ public String getDescription() {+ if (getBranches() != null)+ return "Pull request to branches '" + getBranches() + "' is merged";+ else+ return "Pull request to any branch is merged";+ }+}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/OpenPullRequest.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/OpenPullRequest.javaindex 7cb0a99956..e0945967ab 100644--- a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/OpenPullRequest.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/OpenPullRequest.java@@ -2,9 +2,17 @@ package io.onedev.server.issue.transitiontrigger;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=200, name="Pull request fixing the issue is opened")+@Editable(order=200, name="Pull request is opened")public class OpenPullRequest extends PullRequestTrigger {private static final long serialVersionUID = 1L;+ @Override+ public String getDescription() {+ if (getBranches() != null)+ return "Pull request to branches '" + getBranches() + "' is opened";+ else+ return "Pull request to any branch is opened";+ }+}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PressButtonTrigger.javaindex 0fefa73c3f..6205f90dde 100644--- a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PressButtonTrigger.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PressButtonTrigger.java@@ -2,7 +2,6 @@ package io.onedev.server.issue.transitiontrigger;import java.util.ArrayList;import java.util.Collection;-import java.util.HashSet;import java.util.Iterator;import java.util.List;@@ -13,10 +12,12 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.Usage;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.IssueQuery;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.RoleChoice;@@ -31,6 +32,11 @@ public class PressButtonTrigger extends TransitionTrigger {private List<String> promptFields = new ArrayList<>();+ public PressButtonTrigger() {+ setIssueQuery(io.onedev.server.search.entity.issue.IssueQuery+ .getRuleName(IssueQueryLexer.All));+ }+@Editable(order=100)@NotEmptypublic String getButtonLabel() {@@ -74,6 +80,7 @@ public class PressButtonTrigger extends TransitionTrigger {@Overridepublic void onRenameField(String oldName, String newName) {+ super.onRenameField(oldName, newName);int index = getPromptFields().indexOf(oldName);if (index != -1) {if (getPromptFields().contains(newName))@@ -85,6 +92,8 @@ public class PressButtonTrigger extends TransitionTrigger {@Overridepublic boolean onDeleteField(String fieldName) {+ if (super.onDeleteField(fieldName))+ return true;for (Iterator<String> it = getPromptFields().iterator(); it.hasNext();) {if (it.next().equals(fieldName))it.remove();@@ -101,15 +110,15 @@ public class PressButtonTrigger extends TransitionTrigger {@Overridepublic Usage onDeleteRole(String roleName) {- Usage usage = new Usage();+ Usage usage = super.onDeleteRole(roleName);if (getAuthorizedRoles().contains(roleName))- usage.add("press button trigger: authorized roles");+ usage.add("authorized roles");return usage;}@Overridepublic Collection<String> getUndefinedFields() {- Collection<String> undefinedFields = new HashSet<>();+ Collection<String> undefinedFields = super.getUndefinedFields();GlobalIssueSetting setting = OneDev.getInstance(SettingManager.class).getIssueSetting();for (String field: getPromptFields()) {if (setting.getFieldSpec(field) == null)@@ -133,6 +142,26 @@ public class PressButtonTrigger extends TransitionTrigger {return true;}}++ @Editable(order=1000, name="Applicable Issues", description="Specify criteria of issues applicable for this transition")+ @IssueQuery(withOrder = false, withCurrentUserCriteria = true, withCurrentBuildCriteria = false,+ withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = false)+ @NotEmpty+ @Override+ public String getIssueQuery() {+ return super.getIssueQuery();+ }++ public void setIssueQuery(String issueQuery) {+ super.setIssueQuery(issueQuery);+ }+ @Override+ public String getDescription() {+ if (authorizedRoles.isEmpty())+ return "Button '" + buttonLabel + "' is pressed by any user";+ else+ return "Button '" + buttonLabel + "' is pressed by any user of roles " + authorizedRoles;+ }}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PullRequestTrigger.javaindex 51753db684..9386ea6541 100644--- a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PullRequestTrigger.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PullRequestTrigger.java@@ -1,33 +1,72 @@package io.onedev.server.issue.transitiontrigger;+import java.util.ArrayList;+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.search.entity.issue.IssueQueryLexer;import io.onedev.server.util.Usage;-import io.onedev.server.web.editable.annotation.BranchChoice;+import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.IssueQuery;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;public abstract class PullRequestTrigger extends TransitionTrigger {private static final long serialVersionUID = 1L;- private String branch;+ private String branches;++ public PullRequestTrigger() {+ setIssueQuery(io.onedev.server.search.entity.issue.IssueQuery+ .getRuleName(IssueQueryLexer.FixedInCurrentPullRequest));+ }- @Editable(name="Target Branch")- @BranchChoice+ @Editable(name="Target Branches", order=100,+ description="Optionally specify space-separated target branches of the pull requests to check. "+ + "Use * or ? for wildcard match. Leave empty to match all branches")+ @Patterns(suggester = "suggestBranches")+ @NameOfEmptyValue("Any branch")+ public String getBranches() {+ return branches;+ }++ public void setBranches(String branches) {+ this.branches = branches;+ }++ @Editable(order=1000, name="Applicable Issues", description="Specify criteria of issues applicable for this transition")+ @IssueQuery(withOrder = false, withCurrentUserCriteria = false, withCurrentBuildCriteria = false,+ withCurrentPullRequestCriteria = true, withCurrentCommitCriteria = false)@NotEmpty- public String getBranch() {- return branch;+ @Override+ public String getIssueQuery() {+ return super.getIssueQuery();}- public void setBranch(String branch) {- this.branch = branch;+ public void setIssueQuery(String issueQuery) {+ super.setIssueQuery(issueQuery);}+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestBranches(String matchWith) {+ if (Project.get() != null)+ return SuggestionUtils.suggestBranches(Project.get(), matchWith);+ else+ return new ArrayList<>();+ }+@Overridepublic Usage onDeleteBranch(String branchName) {- Usage usage = new Usage();- if (getBranch().equals(branchName))- usage.add("pull request trigger: target branch");+ Usage usage = super.onDeleteBranch(branchName);+ PatternSet patternSet = PatternSet.parse(branches);+ if (patternSet.getIncludes().contains(branchName) || patternSet.getExcludes().contains(branchName))+ usage.add("target branches");return usage;}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/TransitionTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/TransitionTrigger.javaindex 6f73ba772b..30c4632837 100644--- a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/TransitionTrigger.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/TransitionTrigger.java@@ -3,35 +3,36 @@ package io.onedev.server.issue.transitiontrigger;import java.io.Serializable;import java.util.Collection;import java.util.HashSet;-import java.util.Map;++import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.IssueQuery;@Editablepublic abstract class TransitionTrigger implements Serializable {private static final long serialVersionUID = 1L;-- public void onRenameState(String oldName, String newName) {- }- public boolean onDeleteState(String stateName) {- return false;+ private String issueQuery;++ @Editable(order=1000, name="Applicable Issues", description="Specify criteria of issues applicable for this transition")+ @IssueQuery(withOrder = false, withCurrentUserCriteria = false, withCurrentBuildCriteria = true,+ withCurrentPullRequestCriteria = true, withCurrentCommitCriteria = true)+ @NotEmpty+ public String getIssueQuery() {+ return issueQuery;}- public void onRenameField(String oldName, String newName) {+ public void setIssueQuery(String issueQuery) {+ this.issueQuery = issueQuery;}-- public boolean onDeleteField(String fieldName) {- return false;- }-- public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {- return false;++ public Usage onDeleteBranch(String branchName) {+ return new Usage();}public void onRenameRole(String oldName, String newName) {@@ -41,23 +42,97 @@ public abstract class TransitionTrigger implements Serializable {return new Usage();}- public Usage onDeleteBranch(String branchName) {- return new Usage();+ public void onRenameState(String oldName, String newName) {+ try {+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);+ parsedQuery.onRenameState(oldName, newName);+ issueQuery = parsedQuery.toString();+ } catch (Exception e) {+ }}-++ public boolean onDeleteState(String stateName) {+ try {+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);+ if (parsedQuery.onDeleteState(stateName)) {+ return true;+ } else {+ issueQuery = parsedQuery.toString();+ return false;+ }+ } catch (Exception e) {+ return false;+ }+ }++ public void onRenameField(String oldName, String newName) {+ try {+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);+ parsedQuery.onRenameField(oldName, newName);+ issueQuery = parsedQuery.toString();+ } catch (Exception e) {+ }+ }++ public boolean onDeleteField(String fieldName) {+ try {+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);+ if (parsedQuery.onDeleteField(fieldName)) {+ return true;+ } else {+ issueQuery = parsedQuery.toString();+ return false;+ }+ } catch (Exception e) {+ return false;+ }+ }++ public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {+ try {+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);+ if (parsedQuery.onEditFieldValues(fieldName, valueSetEdit)) {+ return true;+ } else {+ issueQuery = parsedQuery.toString();+ return false;+ }+ } catch (Exception e) {+ return false;+ }+ }+public Collection<String> getUndefinedStates() {- return new HashSet<>();- }-- public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ try {+ return io.onedev.server.search.entity.issue.IssueQuery+ .parse(null, issueQuery, false, true, true, true, true).getUndefinedStates();+ } catch (Exception e) {+ return new HashSet<>();+ }}-+public Collection<String> getUndefinedFields() {- return new HashSet<>();- }-- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {- return new HashSet<>();+ try {+ return io.onedev.server.search.entity.issue.IssueQuery+ .parse(null, issueQuery, false, true, true, true, true).getUndefinedFields();+ } catch (Exception e) {+ return new HashSet<>();+ }}++ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ try {+ return io.onedev.server.search.entity.issue.IssueQuery+ .parse(null, issueQuery, false, true, true, true, true).getUndefinedFieldValues();+ } catch (Exception e) {+ return new HashSet<>();+ }+ }+ public abstract String getDescription();}diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex b1ae969a02..16d3c910ad 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -1333,4 +1333,48 @@ public class DataMigrator {}}+ private void migrate30(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String key = element.elementTextTrim("key");+ if (key.equals("JOB_EXECUTORS"))+ element.detach();+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate31(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Roles.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element editableIssueFieldsElement = element.element("editableIssueFields");+ editableIssueFieldsElement.detach();+ element.addElement("editableIssueFields").addAttribute(+ "class", "io.onedev.server.model.support.role.AllIssueFields");+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate32(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String key = element.elementTextTrim("key");+ if (key.equals("ISSUE"))+ element.detach();+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("IssueChanges.xml")) {+ FileUtils.deleteFile(file);+ }+ }+ }}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 2843c62d9d..98a8da4311 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@@ -289,9 +289,28 @@ public class Build extends AbstractEntity implements Referenceable {setErrorMessage(errorMessage);}+ public Date getStatusDate() {+ switch (status) {+ case FAILED:+ case CANCELLED:+ case SUCCESSFUL:+ case TIMED_OUT:+ return getFinishDate();+ case WAITING:+ return getRetryDate()!=null?getRetryDate():getSubmitDate();+ case RUNNING:+ return getRunningDate();+ case PENDING:+ return getPendingDate();+ default:+ throw new RuntimeException("Unexpected build status: " + status);+ }+ }+public boolean isFinished() {return status == Status.FAILED- || status == Status.CANCELLED || status == Status.SUCCESSFUL+ || status == Status.CANCELLED+ || status == Status.SUCCESSFUL|| status == Status.TIMED_OUT;}@@ -595,7 +614,7 @@ public class Build extends AbstractEntity implements Referenceable {public Void call() throws Exception {File artifactsDir = getArtifactsDir();FileUtils.createDir(artifactsDir);- PatternSet patternSet = PatternSet.fromString(artifacts);+ PatternSet patternSet = PatternSet.parse(artifacts);int baseLen = workspaceDir.getAbsolutePath().length() + 1;for (File file: patternSet.listFiles(workspaceDir)) {try {@@ -637,7 +656,7 @@ public class Build extends AbstractEntity implements Referenceable {public Void call() throws Exception {File artifactsDir = dependency.getArtifactsDir();if (artifactsDir.exists()) {- PatternSet patternSet = PatternSet.fromString(artifacts);+ PatternSet patternSet = PatternSet.parse(artifacts);int baseLen = artifactsDir.getAbsolutePath().length() + 1;for (File file: patternSet.listFiles(artifactsDir)) {try {@@ -710,7 +729,7 @@ public class Build extends AbstractEntity implements Referenceable {descendants.add(getCommitId());Collection<String> branches = new ArrayList<>();- for (RefInfo ref: getProject().getBranches()) {+ for (RefInfo ref: getProject().getBranchRefInfos()) {String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getRef().getName()));if (descendants.contains(ref.getPeeledObj()))branches.add(branchName);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 3d9d85964e..5ca8f0c4cf 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@@ -395,7 +395,7 @@ public class Project extends AbstractEntity {this.forks = forks;}- public List<RefInfo> getBranches() {+ public List<RefInfo> getBranchRefInfos() {List<RefInfo> refInfos = getRefInfos(Constants.R_HEADS);for (Iterator<RefInfo> it = refInfos.iterator(); it.hasNext();) {RefInfo refInfo = it.next();@@ -409,7 +409,7 @@ public class Project extends AbstractEntity {return refInfos;}- public List<RefInfo> getTags() {+ public List<RefInfo> getTagRefInfos() {return getRefInfos(Constants.R_TAGS);}@@ -674,7 +674,7 @@ public class Project extends AbstractEntity {public List<String> getJobNames() {if (jobNames == null) {Set<String> jobNameSet = new HashSet<>();- for (RefInfo refInfo: getBranches()) {+ for (RefInfo refInfo: getBranchRefInfos()) {Blob blob = getBlob(new BlobIdent(refInfo.getPeeledObj().name(),BuildSpec.BLOB_PATH, FileMode.TYPE_FILE), false);if (blob != null && blob.getText() != null) {@@ -1142,7 +1142,7 @@ public class Project extends AbstractEntity {for (TagProtection protection: getTagProtections()) {if (protection.isEnabled()&& UserMatch.fromString(protection.getUserMatch()).matches(this, user)- && PatternSet.fromString(protection.getTags()).matches(new PathMatcher(), tagName)) {+ && PatternSet.parse(protection.getTags()).matches(new PathMatcher(), tagName)) {noCreation = noCreation || protection.isNoCreation();noDeletion = noDeletion || protection.isNoDeletion();noUpdate = noUpdate || protection.isNoUpdate();@@ -1163,11 +1163,11 @@ public class Project extends AbstractEntity {boolean noForcedPush = false;Set<String> jobNames = new HashSet<>();List<FileProtection> fileProtections = new ArrayList<>();- ReviewRequirement reviewRequirement = ReviewRequirement.fromString(null);+ ReviewRequirement reviewRequirement = ReviewRequirement.parse(null, true);for (BranchProtection protection: getBranchProtections()) {if (protection.isEnabled()&& UserMatch.fromString(protection.getUserMatch()).matches(this, user)- && PatternSet.fromString(protection.getBranches()).matches(new PathMatcher(), branchName)) {+ && PatternSet.parse(protection.getBranches()).matches(new PathMatcher(), branchName)) {noCreation = noCreation || protection.isNoCreation();noDeletion = noDeletion || protection.isNoDeletion();noForcedPush = noForcedPush || protection.isNoForcedPush();@@ -1319,15 +1319,15 @@ public class Project extends AbstractEntity {Collection<ObjectId> descendants = commitInfoManager.getDescendants(this, Sets.newHashSet(commitId));descendants.add(commitId);- PatternSet branchPatterns = PatternSet.fromString(branches);- for (RefInfo ref: getBranches()) {+ PatternSet branchPatterns = PatternSet.parse(branches);+ for (RefInfo ref: getBranchRefInfos()) {String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getRef().getName()));if (descendants.contains(ref.getPeeledObj()) && branchPatterns.matches(matcher, branchName))return true;}return false;} else {- return PatternSet.fromString(branches).matches(matcher, "master");+ return PatternSet.parse(branches).matches(matcher, "master");}}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex f77c009e53..94ef2e65f4 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -9,6 +9,7 @@ import java.util.Date;import java.util.HashSet;import java.util.List;import java.util.Optional;+import java.util.Stack;import java.util.UUID;import java.util.stream.Collectors;@@ -38,7 +39,6 @@ import com.fasterxml.jackson.annotation.JsonView;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.GitUtils;import io.onedev.server.infomanager.UserInfoManager;@@ -48,6 +48,7 @@ import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.storage.AttachmentStorageSupport;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.Referenceable;@@ -55,6 +56,8 @@ import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.util.jackson.RestView;+import io.onedev.server.web.util.PullRequestAware;+import io.onedev.server.web.util.WicketUtils;@Entity@Table(@@ -82,6 +85,15 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate static final int MAX_CHECK_ERROR_LEN = 1024;+ private static ThreadLocal<Stack<PullRequest>> stack = new ThreadLocal<Stack<PullRequest>>() {++ @Override+ protected Stack<PullRequest> initialValue() {+ return new Stack<PullRequest>();+ }++ };+@Embeddedprivate CloseInfo closeInfo;@@ -176,7 +188,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate transient Boolean valid;- private transient Collection<Issue> fixedIssues;+ private transient Collection<Long> fixedIssueNumbers;@Column(length=MAX_CHECK_ERROR_LEN)private String checkError;@@ -789,18 +801,13 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachreturn PullRequest.class.getName() + ":" + requestId;}- public Collection<Issue> getFixedIssues() {- if (fixedIssues == null) {- fixedIssues = new HashSet<>();- for (RevCommit commit: getCommits()) {- for (Long issueNumber: IssueUtils.parseFixedIssueNumbers(commit.getFullMessage())) {- Issue issue = OneDev.getInstance(IssueManager.class).find(getTargetProject(), issueNumber);- if (issue != null)- fixedIssues.add(issue);- }- }+ public Collection<Long> getFixedIssueNumbers() {+ if (fixedIssueNumbers == null) {+ fixedIssueNumbers = new HashSet<>();+ for (RevCommit commit: getCommits())+ fixedIssueNumbers.addAll(IssueUtils.parseFixedIssueNumbers(commit.getFullMessage()));}- return fixedIssues;+ return fixedIssueNumbers;}public boolean isAllReviewsApproved() {@@ -872,4 +879,28 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachreturn getTargetProject() + "#" + getNumber();}+ public static void push(PullRequest request) {+ stack.get().push(request);+ }++ public static void pop() {+ stack.get().pop();+ }++ @Nullable+ public static PullRequest get() {+ if (!stack.get().isEmpty()) {+ return stack.get().peek();+ } else {+ ComponentContext componentContext = ComponentContext.get();+ if (componentContext != null) {+ PullRequestAware pullRequestAware = WicketUtils.findInnermost(+ componentContext.getComponent(), PullRequestAware.class);+ if (pullRequestAware != null)+ return pullRequestAware.getPullRequest();+ }+ return null;+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex ea9bbca717..5639ccb460 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -22,7 +22,9 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.role.AllIssueFields;import io.onedev.server.model.support.role.CodePrivilege;+import io.onedev.server.model.support.role.IssueFieldSet;import io.onedev.server.model.support.role.JobPrivilege;import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.AccessBuildLog;@@ -42,7 +44,6 @@ import io.onedev.server.security.permission.ScheduleIssues;import io.onedev.server.security.permission.WriteCode;import io.onedev.server.util.EditContext;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.ShowCondition;@@ -75,7 +76,7 @@ public class Role extends AbstractEntity implements Permission {@Lob@Column(length=65535, nullable=false)- private ArrayList<String> editableIssueFields = new ArrayList<>();+ private IssueFieldSet editableIssueFields = new AllIssueFields();private boolean manageBuilds;@@ -178,14 +179,14 @@ public class Role extends AbstractEntity implements Permission {}@Editable(order=600, description="Optionally specify custom fields allowed to edit when open new issues")- @ChoiceProvider("getIssueFieldChoices")@ShowCondition("isManageIssuesDisabled")- public List<String> getEditableIssueFields() {+ @NotNull+ public IssueFieldSet getEditableIssueFields() {return editableIssueFields;}- public void setEditableIssueFields(List<String> editableIssueFields) {- this.editableIssueFields = (ArrayList<String>)editableIssueFields;+ public void setEditableIssueFields(IssueFieldSet editableIssueFields) {+ this.editableIssueFields = editableIssueFields;}@SuppressWarnings("unused")@@ -261,8 +262,7 @@ public class Role extends AbstractEntity implements Permission {permissions.add(new ManageIssues());if (scheduleIssues)permissions.add(new ScheduleIssues());- for (String issueField: editableIssueFields)- permissions.add(new EditIssueField(issueField));+ permissions.add(new EditIssueField(editableIssueFields.getIncludeFields()));if (manageBuilds)permissions.add(new ManageBuilds());for (JobPrivilege jobPrivilege: jobPrivileges) {diff --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 edf6401587..e8a53943d5 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@@ -87,7 +87,7 @@ public class BranchProtection implements Serializable {}@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+ @io.onedev.server.web.editable.annotation.UserMatch@NotEmpty(message="may not be empty")public String getUserMatch() {return userMatch;@@ -138,7 +138,7 @@ public class BranchProtection implements Serializable {public ReviewRequirement getParsedReviewRequirement() {if (parsedReviewRequirement == null)- parsedReviewRequirement = ReviewRequirement.fromString(reviewRequirement);+ parsedReviewRequirement = ReviewRequirement.parse(reviewRequirement, true);return parsedReviewRequirement;}@@ -171,9 +171,9 @@ public class BranchProtection implements Serializable {public FileProtection getFileProtection(String file) {Set<String> jobNames = new HashSet<>();- ReviewRequirement reviewRequirement = ReviewRequirement.fromString(null);+ ReviewRequirement reviewRequirement = ReviewRequirement.parse(null, true);for (FileProtection protection: fileProtections) {- if (PatternSet.fromString(protection.getPaths()).matches(new PathMatcher(), file)) {+ if (PatternSet.parse(protection.getPaths()).matches(new PathMatcher(), file)) {jobNames.addAll(protection.getJobNames());reviewRequirement.mergeWith(protection.getParsedReviewRequirement());}diff --git a/server-core/src/main/java/io/onedev/server/model/support/BuildPreservation.java b/server-core/src/main/java/io/onedev/server/model/support/BuildPreservation.javaindex c24c05eaa5..d34adb562c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BuildPreservation.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BuildPreservation.java@@ -18,7 +18,7 @@ public class BuildPreservation implements Serializable {private Integer count;@Editable(order=100, description="Specify the condition preserved builds must match")- @BuildQuery(withCurrentUserCriteria = false, withUnfinishedCriteria = false)+ @BuildQuery(withOrder = false, withCurrentUserCriteria = false, withUnfinishedCriteria = false)@NotEmptypublic String getCondition() {return condition;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 36f03151d7..59800b944b 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@@ -65,7 +65,7 @@ public class FileProtection implements Serializable, Validatable {public ReviewRequirement getParsedReviewRequirement() {if (parsedReviewRequirement == null)- parsedReviewRequirement = ReviewRequirement.fromString(reviewRequirement);+ parsedReviewRequirement = ReviewRequirement.parse(reviewRequirement, true);return parsedReviewRequirement;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/JobSecret.java b/server-core/src/main/java/io/onedev/server/model/support/JobSecret.javaindex 3f5fcf992f..6ad7eecd46 100644--- a/server-core/src/main/java/io/onedev/server/model/support/JobSecret.java+++ b/server-core/src/main/java/io/onedev/server/model/support/JobSecret.java@@ -103,7 +103,7 @@ public class JobSecret implements Serializable {public boolean isAuthorized(Project project, String branch) {return authorizedBranches == null- || PatternSet.fromString(authorizedBranches).matches(new PathMatcher(), branch);+ || PatternSet.parse(authorizedBranches).matches(new PathMatcher(), branch);}}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 7caaf846ce..2c2811669f 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@@ -59,7 +59,7 @@ public class TagProtection implements Serializable {}@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+ @io.onedev.server.web.editable.annotation.UserMatch@NotEmpty(message="may not be empty")public String getUserMatch() {return userMatch;@@ -120,7 +120,7 @@ public class TagProtection implements Serializable {public Usage getTagUsage(String tagName) {Usage usage = new Usage();- PatternSet patternSet = PatternSet.fromString(getTags());+ PatternSet patternSet = PatternSet.parse(getTags());if (patternSet.getIncludes().contains(tagName) || patternSet.getExcludes().contains(tagName))usage.add("tag protection '" + getTags() + "'");return usage;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex 798a5c08af..d1ab751d85 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -16,7 +16,9 @@ import javax.annotation.Nullable;import com.google.common.collect.Lists;import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.server.OneDev;import io.onedev.server.OneException;+import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.issue.BoardSpec;import io.onedev.server.issue.StateSpec;import io.onedev.server.issue.TransitionSpec;@@ -27,10 +29,11 @@ import io.onedev.server.issue.fieldspec.IssueChoiceField;import io.onedev.server.issue.fieldspec.UserChoiceField;import io.onedev.server.issue.transitiontrigger.BuildSuccessfulTrigger;import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;+import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.search.entity.issue.OrCriteria;+import io.onedev.server.search.entity.issue.OrIssueCriteria;import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;@@ -365,7 +368,7 @@ public class GlobalIssueSetting implements Serializable {for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true);+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);if (query.onDeleteState(stateName))it.remove();else@@ -382,7 +385,7 @@ public class GlobalIssueSetting implements Serializable {board.onRenameState(oldName, newName);for (NamedIssueQuery namedQuery: getNamedQueries()) {try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true);+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);query.onRenameState(oldName, newName);namedQuery.setQuery(query.toString());} catch (Exception e) {@@ -400,21 +403,21 @@ public class GlobalIssueSetting implements Serializable {return getFieldSpecMap(null).get(fieldName);}- public void onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {+ public void onEditFieldValues(@Nullable Project project, String fieldName, ValueSetEdit valueSetEdit) {for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {TransitionSpec transition = it.next();if (transition.onEditFieldValues(fieldName, valueSetEdit))it.remove();}for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {- if (it.next().onEditFieldValues(fieldName, valueSetEdit))+ if (it.next().onEditFieldValues(project, fieldName, valueSetEdit))it.remove();}for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true);+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);if (query.onEditFieldValues(fieldName, valueSetEdit))it.remove();else@@ -430,8 +433,10 @@ public class GlobalIssueSetting implements Serializable {deletedFields.add(field.getName());}}- for (String deletedField: deletedFields)+ for (String deletedField: deletedFields) {onDeleteField(deletedField);+ OneDev.getInstance(RoleManager.class).onDeleteIssueField(deletedField);+ }}public void onRenameField(String oldName, String newName) {@@ -440,10 +445,10 @@ public class GlobalIssueSetting implements Serializable {for (FieldSpec field: getFieldSpecs())field.onRenameInput(oldName, newName);for (BoardSpec board: getDefaultBoardSpecs())- board.onRenameField(this, oldName, newName);+ board.onRenameField(oldName, newName);for (NamedIssueQuery namedQuery: getNamedQueries()) {try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true);+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);query.onRenameField(oldName, newName);namedQuery.setQuery(query.toString());} catch (Exception e) {@@ -458,14 +463,14 @@ public class GlobalIssueSetting implements Serializable {}for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {- if (it.next().onDeleteField(this, fieldName))+ if (it.next().onDeleteField(fieldName))it.remove();}for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true);+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);if (query.onDeleteField(fieldName))it.remove();else@@ -488,10 +493,7 @@ public class GlobalIssueSetting implements Serializable {public Usage onDeleteUser(String userName) {Usage usage = new Usage();for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {- Usage usageInBoard = it.next().onDeleteUser(this, userName);- if (usageInBoard != null)- usage.add(usageInBoard);- else+ if (it.next().onDeleteUser(this, userName))it.remove();}for (FieldSpec field: getFieldSpecs())@@ -541,7 +543,7 @@ public class GlobalIssueSetting implements Serializable {if (category == state.getCategory())criterias.add(new StateCriteria(state.getName()));}- return new OrCriteria(criterias);+ return new OrIssueCriteria(criterias);}public List<BoardSpec> getDefaultBoardSpecs() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.javaindex dfb240f278..4fe39a84ec 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java@@ -114,7 +114,7 @@ public class GroovyScript implements Serializable {} else if (isCanBeUsedByBuildJobs() && identity instanceof JobIdentity) {JobIdentity jobIdentity = (JobIdentity) identity;Matcher matcher = new PathMatcher();- return (getAllowedProjects() == null || PatternSet.fromString(getAllowedProjects()).matches(matcher, jobIdentity.getProject().getName()))+ return (getAllowedProjects() == null || PatternSet.parse(getAllowedProjects()).matches(matcher, jobIdentity.getProject().getName()))&& (getAllowedBranches() == null || jobIdentity.getProject().isCommitOnBranches(jobIdentity.getCommitId(), getAllowedBranches()));} else {return false;@@ -124,7 +124,7 @@ public class GroovyScript implements Serializable {public Usage onDeleteProject(String projectName, int index) {Usage usage = new Usage();if (getAllowedProjects() != null) {- PatternSet patternSet = PatternSet.fromString(getAllowedProjects());+ PatternSet patternSet = PatternSet.parse(getAllowedProjects());if (patternSet.getIncludes().contains(projectName) || patternSet.getExcludes().contains(projectName))usage.add("allowed projects");}@@ -132,7 +132,7 @@ public class GroovyScript implements Serializable {}public void onRenameProject(String oldName, String newName) {- PatternSet patternSet = PatternSet.fromString(getAllowedProjects());+ PatternSet patternSet = PatternSet.parse(getAllowedProjects());if (patternSet.getIncludes().remove(oldName))patternSet.getIncludes().add(newName);if (patternSet.getExcludes().remove(oldName))diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.javaindex 465d41d8f2..af053c37b7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java@@ -41,12 +41,9 @@ public class AutoDiscoveredJobExecutor extends JobExecutor {context.getLogger().log("Discovered job executor type: "+ EditableUtils.getDisplayName(jobExecutor.getClass()));jobExecutor.setName(getName());- jobExecutor.setApplicableBranches(getApplicableBranches());jobExecutor.setCacheTTL(getCacheTTL());jobExecutor.setEnabled(isEnabled());- jobExecutor.setApplicableJobImages(getApplicableJobImages());- jobExecutor.setApplicableJobNames(getApplicableJobNames());- jobExecutor.setApplicableProjects(getApplicableProjects());+ jobExecutor.setJobMatch(getJobMatch());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/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javaindex 94203269d0..cb266e8660 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java@@ -4,7 +4,6 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;@@ -13,15 +12,11 @@ import io.onedev.commons.launcher.loader.ExtensionPoint;import io.onedev.server.OneDev;import io.onedev.server.buildspec.job.JobContext;import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.model.Project;+import io.onedev.server.model.Build;import io.onedev.server.util.Usage;-import io.onedev.server.util.match.Matcher;-import io.onedev.server.util.match.PathMatcher;-import io.onedev.server.util.patternset.PatternSet;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.Patterns;+import io.onedev.server.web.editable.annotation.JobMatch;import io.onedev.server.web.util.SuggestionUtils;@ExtensionPoint@@ -34,14 +29,8 @@ public abstract class JobExecutor implements Serializable {private String name;- private String applicableProjects;+ private String jobMatch = "all";- private String applicableBranches;-- private String applicableJobNames;-- private String applicableJobImages;-private int cacheTTL = 7;public boolean isEnabled() {@@ -63,50 +52,18 @@ public abstract class JobExecutor implements Serializable {this.name = name;}- @Editable(order=10000, group="Job Applicability",- description="Optionally specify space-separated projects applicable for this executor. "- + "Use * or ? for wildcard match")- @Patterns(suggester = "suggestProjects")- @NameOfEmptyValue("All")- public String getApplicableProjects() {- return applicableProjects;- }-- public void setApplicableProjects(String applicableProjects) {- this.applicableProjects = applicableProjects;- }-- @SuppressWarnings("unused")- private static List<InputSuggestion> suggestProjects(String matchWith) {- return SuggestionUtils.suggestProjects(matchWith);- }-- @Editable(order=10100, group="Job Applicability",- description="Optionally specify space-separated branches applicable for this executor. "- + "Use * or ? for wildcard match")- @Patterns- @NameOfEmptyValue("All")- public String getApplicableBranches() {- return applicableBranches;- }-- public void setApplicableBranches(String applicableBranches) {- this.applicableBranches = applicableBranches;+ @Editable(order=10000, name="Job Match Condition", description="Jobs applicable for this executor must match "+ + "condition specified here")+ @JobMatch+ @NotEmpty+ public String getJobMatch() {+ return jobMatch;}- @Editable(order=10200, group="Job Applicability",- description="Optionally specify space-separated jobs applicable for this executor. "- + "Use * or ? for wildcard match")- @Patterns- @NameOfEmptyValue("All")- public String getApplicableJobNames() {- return applicableJobNames;+ public void setJobMatch(String jobMatch) {+ this.jobMatch = jobMatch;}- public void setApplicableJobNames(String applicableJobNames) {- this.applicableJobNames = applicableJobNames;- }-@SuppressWarnings("unused")private static List<InputSuggestion> suggestJobNames(String matchWith) {List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames(null));@@ -114,19 +71,6 @@ public abstract class JobExecutor implements Serializable {return SuggestionUtils.suggest(jobNames, matchWith);}- @Editable(order=10300, group="Job Applicability",- description="Optionally specify space-separated job images applicable for this executor. "- + "Use * or ? for wildcard match")- @Patterns- @NameOfEmptyValue("All")- public String getApplicableJobImages() {- return applicableJobImages;- }-- public void setApplicableJobImages(String applicableJobImages) {- this.applicableJobImages = applicableJobImages;- }-@Editable(order=50000, group="More Settings", description="Specify job cache TTL (time to live) by days. "+ "OneDev may create multiple job caches even for same cache key to avoid cache conflicts when "+ "running jobs concurrently. This setting tells OneDev to remove caches inactive for specified "@@ -141,35 +85,36 @@ 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 jobImage) {- Matcher matcher = new PathMatcher();-- return isEnabled()- && (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 final boolean isApplicable(Build build) {+ return isEnabled() && io.onedev.server.util.jobmatch.JobMatch.parse(jobMatch).matches(build);}public Usage onDeleteProject(String projectName, int executorIndex) {Usage usage = new Usage();- if (getApplicableProjects() != null) {- PatternSet patternSet = PatternSet.fromString(getApplicableProjects());- if (patternSet.getIncludes().contains(projectName) || patternSet.getExcludes().contains(projectName))- usage.add("applicable projects");- }- return usage.prefix("job executor #" + executorIndex);+ if (io.onedev.server.util.jobmatch.JobMatch.parse(jobMatch).isUsingProject(projectName))+ usage.add("job executor #" + executorIndex + ": job match" );+ return usage;}public void onRenameProject(String oldName, String newName) {- PatternSet patternSet = PatternSet.fromString(getApplicableProjects());- if (patternSet.getIncludes().remove(oldName))- patternSet.getIncludes().add(newName);- if (patternSet.getExcludes().remove(oldName))- patternSet.getExcludes().add(newName);- setApplicableProjects(patternSet.toString());- if (getApplicableProjects().length() == 0)- setApplicableProjects(null);+ io.onedev.server.util.jobmatch.JobMatch parsedJobMatch =+ io.onedev.server.util.jobmatch.JobMatch.parse(this.jobMatch);+ parsedJobMatch.onRenameProject(oldName, newName);+ jobMatch = parsedJobMatch.toString();}+ public Usage onDeleteUser(String userName, int executorIndex) {+ Usage usage = new Usage();+ if (io.onedev.server.util.jobmatch.JobMatch.parse(jobMatch).isUsingUser(userName))+ usage.add("job executor #" + executorIndex + ": job match" );+ return usage;+ }++ public void onRenameUser(String oldName, String newName) {+ io.onedev.server.util.jobmatch.JobMatch parsedJobMatch =+ io.onedev.server.util.jobmatch.JobMatch.parse(this.jobMatch);+ parsedJobMatch.onRenameUser(oldName, newName);+ jobMatch = parsedJobMatch.toString();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.javaindex 93b5284bc2..39e2382dcc 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java@@ -63,8 +63,8 @@ public class ServiceLocator implements Serializable {public final boolean isApplicable(JobService service) {Matcher matcher = new PathMatcher();- return (getServiceNames() == null || PatternSet.fromString(getServiceNames()).matches(matcher, service.getName()))- && (getServiceImages() == null || PatternSet.fromString(getServiceImages()).matches(matcher, service.getImage()));+ return (getServiceNames() == null || PatternSet.parse(getServiceNames()).matches(matcher, service.getName()))+ && (getServiceImages() == null || PatternSet.parse(getServiceImages()).matches(matcher, service.getImage()));}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.javaindex dbe6a2324f..9d4eb38909 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java@@ -35,7 +35,8 @@ public class NamedIssueQuery implements NamedQuery {}@Editable- @IssueQuery(withCurrentUserCriteria = true, withCurrentBuildCriteria = false)+ @IssueQuery(withCurrentUserCriteria = true, withCurrentBuildCriteria = false,+ withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = false)@NotEmpty@Overridepublic String getQuery() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.javaindex e9d70b4660..77489bb75d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java@@ -126,8 +126,11 @@ public class ProjectIssueSetting implements Serializable {public Usage onDeleteBranch(String branchName) {Usage usage = new Usage();if (transitionSpecs != null) {- for (TransitionSpec transitionSpec: transitionSpecs)- usage.add(transitionSpec.onDeleteBranch(branchName));+ int index = 1;+ for (TransitionSpec transitionSpec: transitionSpecs) {+ usage.add(transitionSpec.onDeleteBranch(branchName)).prefix("transition #" + index);+ index++;+ }}return usage.prefix("issue setting");}@@ -136,10 +139,7 @@ public class ProjectIssueSetting implements Serializable {Usage usage = new Usage();if (boardSpecs != null) {for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {- Usage usageInBoard = it.next().onDeleteUser(getGlobalSetting(), userName);- if (usageInBoard != null)- usage.add(usageInBoard);- else+ if (it.next().onDeleteUser(getGlobalSetting(), userName))it.remove();}}@@ -156,8 +156,11 @@ public class ProjectIssueSetting implements Serializable {public Usage onDeleteRole(String roleName) {Usage usage = new Usage();if (transitionSpecs != null) {- for (TransitionSpec transition: transitionSpecs)- usage.add(transition.onDeleteRole(roleName));+ int index = 1;+ for (TransitionSpec transition: transitionSpecs) {+ usage.add(transition.onDeleteRole(roleName).prefix("transition #" + index));+ index ++;+ }}return usage.prefix("issue setting");}@@ -183,7 +186,7 @@ public class ProjectIssueSetting implements Serializable {if (namedQueries != null) {for (NamedIssueQuery namedQuery: namedQueries) {try {- undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true).getUndefinedFields());+ undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFields());} catch (Exception e) {}}@@ -212,7 +215,7 @@ public class ProjectIssueSetting implements Serializable {for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true);+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);boolean remove = false;for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {UndefinedFieldResolution resolution = entry.getValue();@@ -253,7 +256,7 @@ public class ProjectIssueSetting implements Serializable {if (namedQueries != null) {for (NamedIssueQuery namedQuery: namedQueries) {try {- undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true).getUndefinedStates());+ undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedStates());} catch (Exception e) {}}@@ -276,7 +279,7 @@ public class ProjectIssueSetting implements Serializable {if (namedQueries != null) {for (NamedIssueQuery namedQuery: namedQueries) {try {- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true);+ IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());namedQuery.setQuery(query.toString());@@ -296,19 +299,19 @@ public class ProjectIssueSetting implements Serializable {}}- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();if (namedQueries != null) {for (NamedIssueQuery namedQuery: namedQueries) {try {- undefinedFieldValues.addAll(IssueQuery.parse(null, namedQuery.getQuery(), false, true, true).getUndefinedFieldValues());+ undefinedFieldValues.addAll(IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFieldValues());} catch (Exception e) {}}}if (boardSpecs != null) {for (BoardSpec board: boardSpecs)- undefinedFieldValues.addAll(board.getUndefinedFieldValues());+ undefinedFieldValues.addAll(board.getUndefinedFieldValues(project));}if (transitionSpecs != null) {for (TransitionSpec transition: transitionSpecs)@@ -317,13 +320,13 @@ public class ProjectIssueSetting implements Serializable {return undefinedFieldValues;}- public void fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {+ public void fixUndefinedFieldValues(Project project, Map<String, ValueSetEdit> valueSetEdits) {if (namedQueries != null) {for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {boolean remove = false;- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true);+ IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {if (query.onEditFieldValues(entry.getKey(), entry.getValue())) {remove = true;@@ -340,7 +343,7 @@ public class ProjectIssueSetting implements Serializable {}if (boardSpecs != null) {for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {- if (it.next().fixUndefinedFieldValues(valueSetEdits)) {+ if (it.next().fixUndefinedFieldValues(project, valueSetEdits)) {it.remove();break;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.javaindex 03d9fcb9c8..d235e07377 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java@@ -1,7 +1,6 @@package io.onedev.server.model.support.issue.changedata;import java.util.HashMap;-import java.util.List;import java.util.Map;import org.apache.wicket.Component;@@ -17,19 +16,19 @@ public class IssueCommittedData implements IssueChangeData {private static final long serialVersionUID = 1L;- private final List<String> commitHashes;+ private final String commitHash;- public IssueCommittedData(List<String> commitHashes) {- this.commitHashes = commitHashes;+ public IssueCommittedData(String commitHash) {+ this.commitHash = commitHash;}- public List<String> getCommitHashes() {- return commitHashes;+ public String getCommitHash() {+ return commitHash;}@Overridepublic Component render(String componentId, IssueChange change) {- return new IssueCommittedPanel(componentId, commitHashes) {+ return new IssueCommittedPanel(componentId, commitHash) {private static final long serialVersionUID = 1L;@@ -42,7 +41,7 @@ public class IssueCommittedData implements IssueChangeData {@Overridepublic String getDescription() {- return "New commits fixing this issue added";+ return "New commit fixing this issue added";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/role/AllIssueFields.java b/server-core/src/main/java/io/onedev/server/model/support/role/AllIssueFields.javanew file mode 100644index 0000000000..daf26883d9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/role/AllIssueFields.java@@ -0,0 +1,19 @@+package io.onedev.server.model.support.role;++import java.util.Collection;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=100, name="All")+public class AllIssueFields implements IssueFieldSet {++ private static final long serialVersionUID = 1L;++ @Override+ public Collection<String> getIncludeFields() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldNames();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/ExcludeIssueFields.java b/server-core/src/main/java/io/onedev/server/model/support/role/ExcludeIssueFields.javanew file mode 100644index 0000000000..ce70e6919f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/role/ExcludeIssueFields.java@@ -0,0 +1,46 @@+package io.onedev.server.model.support.role;++import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import javax.validation.constraints.Size;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;++@Editable(order=200, name="All except")+public class ExcludeIssueFields implements IssueFieldSet {++ private static final long serialVersionUID = 1L;++ private List<String> excludeFields = new ArrayList<>();++ @Editable(name="Excluded Fields")+ @ChoiceProvider("getFieldChoices")+ @OmitName+ @Size(min=1, message = "At least one field needs to be specified")+ public List<String> getExcludeFields() {+ return excludeFields;+ }++ public void setExcludeFields(List<String> excludeFields) {+ this.excludeFields = excludeFields;+ }++ @SuppressWarnings("unused")+ private static List<String> getFieldChoices() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldNames();+ }++ @Override+ public Collection<String> getIncludeFields() {+ Collection<String> fields = OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldNames();+ fields.removeAll(excludeFields);+ return fields;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/IncludeIssueFields.java b/server-core/src/main/java/io/onedev/server/model/support/role/IncludeIssueFields.javanew file mode 100644index 0000000000..c1e070c8aa--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/role/IncludeIssueFields.java@@ -0,0 +1,38 @@+package io.onedev.server.model.support.role;++import java.util.ArrayList;+import java.util.List;++import javax.validation.constraints.Size;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;++@Editable(order=300, name="Specified fields")+public class IncludeIssueFields implements IssueFieldSet {++ private static final long serialVersionUID = 1L;++ private List<String> includeFields = new ArrayList<>();++ @Editable(name="Fields")+ @ChoiceProvider("getFieldChoices")+ @OmitName+ @Size(min=1, message = "At least one field needs to be specified")+ public List<String> getIncludeFields() {+ return includeFields;+ }++ public void setIncludeFields(List<String> includeFields) {+ this.includeFields = includeFields;+ }++ @SuppressWarnings("unused")+ private static List<String> getFieldChoices() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldNames();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/IssueFieldSet.java b/server-core/src/main/java/io/onedev/server/model/support/role/IssueFieldSet.javanew file mode 100644index 0000000000..b77fd0d78f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/role/IssueFieldSet.java@@ -0,0 +1,13 @@+package io.onedev.server.model.support.role;++import java.io.Serializable;+import java.util.Collection;++import io.onedev.server.web.editable.annotation.Editable;++@Editable+public interface IssueFieldSet extends Serializable {++ Collection<String> getIncludeFields();++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/NoneIssueFields.java b/server-core/src/main/java/io/onedev/server/model/support/role/NoneIssueFields.javanew file mode 100644index 0000000000..c1ededa38f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/role/NoneIssueFields.java@@ -0,0 +1,19 @@+package io.onedev.server.model.support.role;++import java.util.Collection;++import com.google.common.collect.Sets;++import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=400, name="None")+public class NoneIssueFields implements IssueFieldSet {++ private static final long serialVersionUID = 1L;++ @Override+ public Collection<String> getIncludeFields() {+ return Sets.newHashSet();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.javaindex d46523af40..c608c37d8a 100644--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java@@ -85,7 +85,7 @@ public class IssueNotificationManager {@Overrideprotected EntityQuery<Issue> parse(String queryString) {- return IssueQuery.parse(issue.getProject(), queryString, true, true, false);+ return IssueQuery.parse(issue.getProject(), queryString, true, true, false, false, false);}@Override@@ -111,7 +111,7 @@ public class IssueNotificationManager {@Overrideprotected EntityQuery<Issue> parse(String queryString) {- return IssueQuery.parse(null, queryString, true, true, false);+ return IssueQuery.parse(null, queryString, true, true, false, false, false);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.java b/server-core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.javadeleted file mode 100644index 3c70988303..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.java+++ /dev/null@@ -1,58 +0,0 @@-package io.onedev.server.search.entity;--import java.util.ArrayList;-import java.util.List;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.AbstractEntity;---public class AndCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {-- private static final long serialVersionUID = 1L;-- private final List<? extends EntityCriteria<T>> criterias;-- public AndCriteriaHelper(List<? extends EntityCriteria<T>> criterias) {- this.criterias = criterias;- }-- @Override- public Predicate getPredicate(Root<T> root, CriteriaBuilder builder) {- List<Predicate> predicates = new ArrayList<>();- for (EntityCriteria<T> criteria: criterias)- predicates.add(criteria.getPredicate(root, builder));- return builder.and(predicates.toArray(new Predicate[0]));- }-- @Override- public boolean matches(T entity) {- for (EntityCriteria<T> criteria: criterias) {- if (!criteria.matches(entity))- return false;- }- return true;- }-- @Override- public String toString() {- StringBuilder builder = new StringBuilder();- for (int i=0; i<criterias.size(); i++) {- EntityCriteria<T> criteria = criterias.get(i);- if (i != 0)- builder.append(" and ");- if (criteria instanceof ParensAware) {- builder.append("(");- builder.append(criteria.toString());- builder.append(")");- } else {- builder.append(criteria.toString());- }- }- return builder.toString().trim();- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/AndEntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/AndEntityCriteria.javanew file mode 100644index 0000000000..30fba9aeb2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/AndEntityCriteria.java@@ -0,0 +1,71 @@+package io.onedev.server.search.entity;++import java.util.ArrayList;+import java.util.List;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.util.criteria.AndCriteria;++public class AndEntityCriteria<T extends AbstractEntity> extends EntityCriteria<T> {++ private static final long serialVersionUID = 1L;++ private final List<? extends EntityCriteria<T>> criterias;++ public AndEntityCriteria(List<? extends EntityCriteria<T>> criterias) {+ this.criterias = criterias;+ }++ @Override+ public void onRenameUser(String oldName, String newName) {+ new AndCriteria<T>(criterias).onRenameUser(oldName, newName);+ }++ @Override+ public void onRenameProject(String oldName, String newName) {+ new AndCriteria<T>(criterias).onRenameProject(oldName, newName);+ }++ @Override+ public void onRenameGroup(String oldName, String newName) {+ new AndCriteria<T>(criterias).onRenameGroup(oldName, newName);+ }++ @Override+ public boolean isUsingUser(String userName) {+ return new AndCriteria<T>(criterias).isUsingUser(userName);+ }++ @Override+ public boolean isUsingProject(String projectName) {+ return new AndCriteria<T>(criterias).isUsingProject(projectName);+ }++ @Override+ public boolean isUsingGroup(String groupName) {+ return new AndCriteria<T>(criterias).isUsingGroup(groupName);+ }++ @Override+ public Predicate getPredicate(Root<T> root, CriteriaBuilder builder) {+ List<Predicate> predicates = new ArrayList<>();+ for (EntityCriteria<T> criteria: criterias)+ predicates.add(criteria.getPredicate(root, builder));+ return builder.and(predicates.toArray(new Predicate[0]));+ }++ @Override+ public String asString() {+ return new AndCriteria<T>(criterias).asString();+ }++ @Override+ public boolean matches(T t) {+ return new AndCriteria<T>(criterias).matches(t);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.javaindex e27cccca8f..c52ffa5d1c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java@@ -1,6 +1,5 @@package io.onedev.server.search.entity;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -13,8 +12,9 @@ import javax.persistence.criteria.Root;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.model.AbstractEntity;import io.onedev.server.util.RangeBuilder;+import io.onedev.server.util.criteria.Criteria;-public abstract class EntityCriteria<T extends AbstractEntity> implements Serializable {+public abstract class EntityCriteria<T extends AbstractEntity> extends Criteria<T> {private static final long serialVersionUID = 1L;@@ -22,8 +22,6 @@ public abstract class EntityCriteria<T extends AbstractEntity> implements Serialpublic abstract Predicate getPredicate(Root<T> root, CriteriaBuilder builder);- public abstract boolean matches(T entity);-protected Predicate inManyValues(CriteriaBuilder builder, Path<Long> attribute, Collection<Long> inValues,Collection<Long> allValues) {List<Long> listOfInValues = new ArrayList<>(inValues);@@ -57,7 +55,4 @@ public abstract class EntityCriteria<T extends AbstractEntity> implements Serialreturn builder.or(predicates.toArray(new Predicate[0]));}- @Override- public abstract String toString();-}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex d898311d44..496ea2ac92 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -28,7 +28,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.ProjectAwareCommitId;+import io.onedev.server.util.ProjectAwareCommit;import io.onedev.server.util.ProjectAwareRevision;import io.onedev.server.util.ProjectScopedNumber;@@ -92,10 +92,10 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializareturn dateValue;}- public static ProjectAwareCommitId getCommitId(@Nullable Project project, String value) {+ public static ProjectAwareCommit getCommitId(@Nullable Project project, String value) {if (project != null && !value.contains(":"))value = project.getName() + ":" + value;- ProjectAwareCommitId commitId = ProjectAwareCommitId.from(value);+ ProjectAwareCommit commitId = ProjectAwareCommit.from(value);if (commitId != null && commitId.getCommitId() != null)return commitId;else@@ -193,10 +193,6 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializareturn builder.toString().trim();}- public static String quote(String value) {- return "\"" + StringUtils.escape(value, "\"") + "\"";- }-public static <T> Path<T> getPath(Path<?> root, String pathName) {int index = pathName.indexOf('.');if (index != -1) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntitySort.java b/server-core/src/main/java/io/onedev/server/search/entity/EntitySort.javaindex d1d866a087..eeffe58ece 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntitySort.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntitySort.java@@ -2,6 +2,8 @@ package io.onedev.server.search.entity;import java.io.Serializable;+import io.onedev.server.util.criteria.Criteria;+public class EntitySort implements Serializable {private static final long serialVersionUID = 1L;@@ -31,9 +33,9 @@ public class EntitySort implements Serializable {@Overridepublic String toString() {if (direction == Direction.ASCENDING)- return EntityQuery.quote(field) + " asc";+ return Criteria.quote(field) + " asc";else- return EntityQuery.quote(field) + " desc";+ return Criteria.quote(field) + " desc";}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.java b/server-core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.javadeleted file mode 100644index 31f87aa574..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.java+++ /dev/null@@ -1,34 +0,0 @@-package io.onedev.server.search.entity;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.AbstractEntity;--public class NotCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {-- private static final long serialVersionUID = 1L;-- private final EntityCriteria<T> criteria;-- public NotCriteriaHelper(EntityCriteria<T> criteria) {- this.criteria = criteria;- }-- @Override- public Predicate getPredicate(Root<T> root, CriteriaBuilder builder) {- return criteria.getPredicate(root, builder).not();- }-- @Override- public boolean matches(T entity) {- return !criteria.matches(entity);- }-- @Override- public String toString() {- return "not(" + criteria.toString() + ")";- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.javanew file mode 100644index 0000000000..91dd65cfeb--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.java@@ -0,0 +1,65 @@+package io.onedev.server.search.entity;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.util.criteria.NotCriteria;++public class NotEntityCriteria<T extends AbstractEntity> extends EntityCriteria<T> {++ private static final long serialVersionUID = 1L;++ private final EntityCriteria<T> criteria;++ public NotEntityCriteria(EntityCriteria<T> criteria) {+ this.criteria = criteria;+ }++ @Override+ public Predicate getPredicate(Root<T> root, CriteriaBuilder builder) {+ return criteria.getPredicate(root, builder).not();+ }++ @Override+ public void onRenameUser(String oldName, String newName) {+ new NotCriteria<T>(criteria).onRenameUser(oldName, newName);+ }++ @Override+ public void onRenameProject(String oldName, String newName) {+ new NotCriteria<T>(criteria).onRenameProject(oldName, newName);+ }++ @Override+ public void onRenameGroup(String oldName, String newName) {+ new NotCriteria<T>(criteria).onRenameGroup(oldName, newName);+ }++ @Override+ public boolean isUsingUser(String userName) {+ return new NotCriteria<T>(criteria).isUsingUser(userName);+ }++ @Override+ public boolean isUsingProject(String projectName) {+ return new NotCriteria<T>(criteria).isUsingProject(projectName);+ }++ @Override+ public boolean isUsingGroup(String groupName) {+ return new NotCriteria<T>(criteria).isUsingGroup(groupName);+ }++ @Override+ public boolean matches(T t) {+ return new NotCriteria<T>(criteria).matches(t);+ }++ @Override+ public String asString() {+ return new NotCriteria<T>(criteria).asString();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.java b/server-core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.javadeleted file mode 100644index 22f74cca04..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.java+++ /dev/null@@ -1,58 +0,0 @@-package io.onedev.server.search.entity;--import java.util.ArrayList;-import java.util.List;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.AbstractEntity;---public class OrCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {-- private static final long serialVersionUID = 1L;-- private final List<? extends EntityCriteria<T>> criterias;-- public OrCriteriaHelper(List<? extends EntityCriteria<T>> criterias) {- this.criterias = criterias;- }-- @Override- public Predicate getPredicate(Root<T> root, CriteriaBuilder builder) {- List<Predicate> predicates = new ArrayList<>();- for (EntityCriteria<T> criteria: criterias)- predicates.add(criteria.getPredicate(root, builder));- return builder.or(predicates.toArray(new Predicate[0]));- }-- @Override- public boolean matches(T entity) {- for (EntityCriteria<T> criteria: criterias) {- if (criteria.matches(entity))- return true;- }- return false;- }-- @Override- public String toString() {- StringBuilder builder = new StringBuilder();- for (int i=0; i<criterias.size(); i++) {- EntityCriteria<T> criteria = criterias.get(i);- if (i != 0)- builder.append(" or ");- if (criteria instanceof ParensAware) {- builder.append("(");- builder.append(criteria.toString());- builder.append(")");- } else {- builder.append(criteria.toString());- }- }- return builder.toString().trim();- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/OrEntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/OrEntityCriteria.javanew file mode 100644index 0000000000..bfe87dba2d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/OrEntityCriteria.java@@ -0,0 +1,71 @@+package io.onedev.server.search.entity;++import java.util.ArrayList;+import java.util.List;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.util.criteria.OrCriteria;++public class OrEntityCriteria<T extends AbstractEntity> extends EntityCriteria<T> {++ private static final long serialVersionUID = 1L;++ private final List<? extends EntityCriteria<T>> criterias;++ public OrEntityCriteria(List<? extends EntityCriteria<T>> criterias) {+ this.criterias = criterias;+ }++ @Override+ public Predicate getPredicate(Root<T> root, CriteriaBuilder builder) {+ List<Predicate> predicates = new ArrayList<>();+ for (EntityCriteria<T> criteria: criterias)+ predicates.add(criteria.getPredicate(root, builder));+ return builder.or(predicates.toArray(new Predicate[0]));+ }++ @Override+ public void onRenameUser(String oldName, String newName) {+ new OrCriteria<T>(criterias).onRenameUser(oldName, newName);+ }++ @Override+ public void onRenameProject(String oldName, String newName) {+ new OrCriteria<T>(criterias).onRenameProject(oldName, newName);+ }++ @Override+ public void onRenameGroup(String oldName, String newName) {+ new OrCriteria<T>(criterias).onRenameGroup(oldName, newName);+ }++ @Override+ public boolean isUsingUser(String userName) {+ return new OrCriteria<T>(criterias).isUsingUser(userName);+ }++ @Override+ public boolean isUsingProject(String projectName) {+ return new OrCriteria<T>(criterias).isUsingProject(projectName);+ }++ @Override+ public boolean isUsingGroup(String groupName) {+ return new OrCriteria<T>(criterias).isUsingGroup(groupName);+ }++ @Override+ public boolean matches(T t) {+ return new OrCriteria<T>(criterias).matches(t);+ }++ @Override+ public String asString() {+ return new OrCriteria<T>(criterias).asString();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/ParensAware.java b/server-core/src/main/java/io/onedev/server/search/entity/ParensAware.javadeleted file mode 100644index d68d3a2565..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/ParensAware.java+++ /dev/null@@ -1,5 +0,0 @@-package io.onedev.server.search.entity;--public interface ParensAware {--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.javaindex 9d669d16b1..e755e8e6c7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java@@ -42,8 +42,8 @@ public class AssociatedWithPullRequestCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequest) + " " + BuildQuery.quote(value);+ public String asString() {+ return BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequest) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.javaindex 224ef8eb5a..4fd7598a0f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java@@ -24,7 +24,7 @@ public class AssociatedWithPullRequestsCriteria extends EntityCriteria<Build> {}@Override- public String toString() {+ public String asString() {return BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequests);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4index 3981a14f7d..1a359dbb6d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4@@ -8,6 +8,7 @@ querycriteria: operator=(Successful|Failed|Cancelled|Running|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe|AssociatedWithPullRequests|RequiredByPullRequests) #OperatorCriteria+ | criteriaField=Quoted WS+ operator=IsEmpty #FieldOperatorCriteria| operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|AssociatedWithPullRequest|RequiredByPullRequest) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria@@ -104,6 +105,10 @@ Is: 'is';+IsEmpty+ : 'is' WS+ 'empty'+ ;+IsGreaterThan: 'is' WS+ 'greater' WS+ 'than';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex 3a70d2cce5..94537bf02f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -32,15 +32,16 @@ import io.onedev.server.OneException;import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.AndCriteriaHelper;+import io.onedev.server.search.entity.AndEntityCriteria;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.NotCriteriaHelper;-import io.onedev.server.search.entity.OrCriteriaHelper;+import io.onedev.server.search.entity.NotEntityCriteria;+import io.onedev.server.search.entity.OrEntityCriteria;import io.onedev.server.search.entity.build.BuildQueryParser.AndCriteriaContext;import io.onedev.server.search.entity.build.BuildQueryParser.CriteriaContext;+import io.onedev.server.search.entity.build.BuildQueryParser.FieldOperatorCriteriaContext;import io.onedev.server.search.entity.build.BuildQueryParser.FieldOperatorValueCriteriaContext;import io.onedev.server.search.entity.build.BuildQueryParser.NotCriteriaContext;import io.onedev.server.search.entity.build.BuildQueryParser.OperatorCriteriaContext;@@ -49,7 +50,7 @@ import io.onedev.server.search.entity.build.BuildQueryParser.OrCriteriaContext;import io.onedev.server.search.entity.build.BuildQueryParser.OrderContext;import io.onedev.server.search.entity.build.BuildQueryParser.ParensCriteriaContext;import io.onedev.server.search.entity.build.BuildQueryParser.QueryContext;-import io.onedev.server.util.ProjectAwareCommitId;+import io.onedev.server.util.ProjectAwareCommit;public class BuildQuery extends EntityQuery<Build> {@@ -79,7 +80,7 @@ public class BuildQuery extends EntityQuery<Build> {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new OneException("Malformed query syntax", e);+ throw new OneException("Malformed query", e);}});@@ -94,7 +95,7 @@ public class BuildQuery extends EntityQuery<Build> {if (e instanceof OneException)throw e;else- throw new OneException("Malformed query syntax", e);+ throw new OneException("Malformed query", e);}CriteriaContext criteriaContext = queryContext.criteria();EntityCriteria<Build> buildCriteria;@@ -164,9 +165,20 @@ public class BuildQuery extends EntityQuery<Build> {@Overridepublic EntityCriteria<Build> visitParensCriteria(ParensCriteriaContext ctx) {- return visit(ctx.criteria());+ return (EntityCriteria<Build>) visit(ctx.criteria()).withParens(true);}+ @Override+ public EntityCriteria<Build> visitFieldOperatorCriteria(FieldOperatorCriteriaContext ctx) {+ String fieldName = getValue(ctx.Quoted().getText());+ int operator = ctx.operator.getType();+ checkField(project, fieldName, operator);+ if (fieldName.equals(FIELD_VERSION))+ return new VersionIsEmptyCriteria();+ else+ return new ParamIsEmptyCriteria(fieldName);+ }+@Overridepublic EntityCriteria<Build> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {String fieldName = getValue(ctx.Quoted(0).getText());@@ -192,7 +204,7 @@ public class BuildQuery extends EntityQuery<Build> {case FIELD_PROJECT:return new ProjectCriteria(value);case FIELD_COMMIT:- ProjectAwareCommitId commitId = getCommitId(project, value);+ ProjectAwareCommit commitId = getCommitId(project, value);return new CommitCriteria(commitId.getProject(), commitId.getCommitId());case FIELD_JOB:return new JobCriteria(value);@@ -216,7 +228,7 @@ public class BuildQuery extends EntityQuery<Build> {List<EntityCriteria<Build>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new OrCriteriaHelper<Build>(childCriterias);+ return new OrEntityCriteria<Build>(childCriterias);}@Override@@ -224,12 +236,12 @@ public class BuildQuery extends EntityQuery<Build> {List<EntityCriteria<Build>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new AndCriteriaHelper<Build>(childCriterias);+ return new AndEntityCriteria<Build>(childCriterias);}@Overridepublic EntityCriteria<Build> visitNotCriteria(NotCriteriaContext ctx) {- return new NotCriteriaHelper<Build>(visit(ctx.criteria()));+ return new NotEntityCriteria<Build>(visit(ctx.criteria()));}}.visit(criteriaContext);@@ -278,6 +290,10 @@ public class BuildQuery extends EntityQuery<Build> {throw newOperatorException(fieldName, operator);}break;+ case BuildQueryLexer.IsEmpty:+ if (!fieldName.equals(FIELD_VERSION) && !paramNames.contains(fieldName))+ throw newOperatorException(fieldName, operator);+ break;case BuildQueryLexer.IsLessThan:case BuildQueryLexer.IsGreaterThan:if (!fieldName.equals(FIELD_NUMBER))@@ -319,7 +335,7 @@ public class BuildQuery extends EntityQuery<Build> {sorts.addAll(query2.getSorts());if (criterias.size() > 1)- return new BuildQuery(new AndCriteriaHelper<Build>(criterias), sorts);+ return new BuildQuery(new AndEntityCriteria<Build>(criterias), sorts);else if (criterias.size() == 1)return new BuildQuery(criterias.iterator().next(), sorts);elsediff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.javaindex 9551fd3c75..a68e540dfc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java@@ -9,7 +9,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -39,8 +38,8 @@ public class CancelledByCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.CancelledBy) + " " + BuildQuery.quote(value);+ public String asString() {+ return BuildQuery.getRuleName(BuildQueryLexer.CancelledBy) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.javaindex f609f39f72..990e649ddf 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java@@ -34,7 +34,7 @@ public class CancelledByMeCriteria extends EntityCriteria<Build> {}@Override- public String toString() {+ public String asString() {return BuildQuery.getRuleName(BuildQueryLexer.CancelledByMe);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.javaindex 605b0122e2..0389e47f06 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java@@ -26,7 +26,7 @@ public class CancelledCriteria extends EntityCriteria<Build> {}@Override- public String toString() {+ public String asString() {return BuildQuery.getRuleName(BuildQueryLexer.Cancelled);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.javaindex 7de9e99fb5..0488f3f917 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java@@ -9,7 +9,6 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.BuildQueryConstants;@@ -41,8 +40,10 @@ public class CommitCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.quote(BuildQueryConstants.FIELD_COMMIT) + " " + BuildQuery.getRuleName(BuildQueryLexer.Is) + " " + BuildQuery.quote(commitId.name());+ public String asString() {+ return quote(BuildQueryConstants.FIELD_COMMIT) + " "+ + BuildQuery.getRuleName(BuildQueryLexer.Is) + " "+ + quote(commitId.name());}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.javaindex 52a27c0da7..64dc2b2274 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java@@ -44,8 +44,8 @@ public class DependenciesOfCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.DependenciesOf) + " " + BuildQuery.quote(value);+ public String asString() {+ return BuildQuery.getRuleName(BuildQueryLexer.DependenciesOf) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.javaindex 0a7cbb132e..45a058365f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java@@ -44,8 +44,8 @@ public class DependsOnCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.DependsOn) + " " + BuildQuery.quote(value);+ public String asString() {+ return BuildQuery.getRuleName(BuildQueryLexer.DependsOn) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.javaindex 465f1d8968..5643367148 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java@@ -26,7 +26,7 @@ public class FailedCriteria extends EntityCriteria<Build> {}@Override- public String toString() {+ public String asString() {return BuildQuery.getRuleName(BuildQueryLexer.Failed);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.javaindex 4bd0207e18..e9e389e2a9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java@@ -47,9 +47,9 @@ public class FinishDateCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.quote(BuildQueryConstants.FIELD_FINISH_DATE) + " "- + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(value);+ public String asString() {+ return quote(BuildQueryConstants.FIELD_FINISH_DATE) + " "+ + BuildQuery.getRuleName(operator) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.javaindex 799a198a02..046545eaf0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java@@ -18,7 +18,6 @@ import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -74,8 +73,8 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.FixedIssue) + " " + BuildQuery.quote(value);+ public String asString() {+ return BuildQuery.getRuleName(BuildQueryLexer.FixedIssue) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.javaindex b712daa37e..4954ed7e73 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.BuildQueryConstants;@@ -34,10 +33,10 @@ public class JobCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.quote(BuildQueryConstants.FIELD_JOB) + " "+ public String asString() {+ return quote(BuildQueryConstants.FIELD_JOB) + " "+ BuildQuery.getRuleName(BuildQueryLexer.Is) + " "- + BuildQuery.quote(jobName);+ + quote(jobName);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.javaindex 90ff246803..a3c2974cb9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java@@ -8,7 +8,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectScopedNumber;@@ -60,10 +59,10 @@ public class NumberCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.quote(BuildQueryConstants.FIELD_NUMBER) + " "+ public String asString() {+ return quote(BuildQueryConstants.FIELD_NUMBER) + " "+ BuildQuery.getRuleName(operator) + " "- + BuildQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.javaindex 204031b476..5cbb2c12ca 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java@@ -38,17 +38,14 @@ public class ParamCriteria extends EntityCriteria<Build> {@Overridepublic boolean matches(Build build) {List<String> paramValues = build.getParamMap().get(name);- if (paramValues == null || paramValues.isEmpty())- return value == null;- else- return paramValues.contains(value);+ return paramValues != null && paramValues.contains(value);}@Override- public String toString() {- return BuildQuery.quote(name) + " "- + BuildQuery.getRuleName(BuildQueryLexer.Is)- + " " + BuildQuery.quote(value);+ public String asString() {+ return quote(name) + " "+ + BuildQuery.getRuleName(BuildQueryLexer.Is) + " "+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.javanew file mode 100644index 0000000000..5115c98e40--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java@@ -0,0 +1,46 @@+package io.onedev.server.search.entity.build;++import java.util.List;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Join;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.model.Build;+import io.onedev.server.model.BuildParam;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.BuildQueryConstants;++public class ParamIsEmptyCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ private String name;++ public ParamIsEmptyCriteria(String name) {+ this.name = name;+ }++ @Override+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ Join<?, ?> join = root.join(BuildQueryConstants.ATTR_PARAMS, JoinType.LEFT);+ join.on(builder.and(+ builder.equal(join.get(BuildParam.ATTR_NAME), name)),+ builder.isNull(join.get(BuildParam.ATTR_VALUE)));+ return join.isNotNull();+ }++ @Override+ public boolean matches(Build build) {+ List<String> paramValues = build.getParamMap().get(name);+ return paramValues == null || paramValues.isEmpty();+ }++ @Override+ public String asString() {+ return quote(name) + " " + BuildQuery.getRuleName(BuildQueryLexer.IsEmpty);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.javaindex 870910709e..9f723415a6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java@@ -26,7 +26,7 @@ public class PendingCriteria extends EntityCriteria<Build> {}@Override- public String toString() {+ public String asString() {return BuildQuery.getRuleName(BuildQueryLexer.Pending);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.javaindex c3778ad4db..7fc088aa08 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java@@ -7,7 +7,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.BuildQueryConstants;@@ -39,10 +38,10 @@ public class ProjectCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.quote(BuildQueryConstants.FIELD_PROJECT) + " "+ public String asString() {+ return quote(BuildQueryConstants.FIELD_PROJECT) + " "+ BuildQuery.getRuleName(BuildQueryLexer.Is) + " "- + BuildQuery.quote(projectName);+ + quote(projectName);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.javaindex 660975cfbc..aed9754a3d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java@@ -47,9 +47,10 @@ public class QueueingDateCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.quote(BuildQueryConstants.FIELD_QUEUEING_DATE) + " "- + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(value);+ public String asString() {+ return quote(BuildQueryConstants.FIELD_QUEUEING_DATE) + " "+ + BuildQuery.getRuleName(operator) + " "+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.javaindex 0a88cba096..0fdf3bd264 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java@@ -44,8 +44,8 @@ public class RequiredByPullRequestCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequest) + " " + BuildQuery.quote(value);+ public String asString() {+ return BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequest) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.javaindex fd5814ef9a..5f92d4527a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java@@ -28,7 +28,7 @@ public class RequiredByPullRequestsCriteria extends EntityCriteria<Build> {}@Override- public String toString() {+ public String asString() {return BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequests);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.javaindex 48a395f62d..c7c8e83f3b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java@@ -26,7 +26,7 @@ public class RunningCriteria extends EntityCriteria<Build> {}@Override- public String toString() {+ public String asString() {return BuildQuery.getRuleName(BuildQueryLexer.Running);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.javaindex 1d7e677195..4061142541 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java@@ -47,9 +47,10 @@ public class RunningDateCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.quote(BuildQueryConstants.FIELD_RUNNING_DATE) + " "- + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(value);+ public String asString() {+ return quote(BuildQueryConstants.FIELD_RUNNING_DATE) + " "+ + BuildQuery.getRuleName(operator) + " "+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.javaindex ee164fc8c7..46c35b448c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -47,9 +46,10 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.quote(BuildQueryConstants.FIELD_SUBMIT_DATE) + " "- + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(value);+ public String asString() {+ return quote(BuildQueryConstants.FIELD_SUBMIT_DATE) + " "+ + BuildQuery.getRuleName(operator) + " "+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.javaindex ca71af19a1..8d1137ebea 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java@@ -9,7 +9,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.BuildQueryConstants;@@ -39,8 +38,8 @@ public class SubmittedByCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.SubmittedBy) + " " + BuildQuery.quote(value);+ public String asString() {+ return BuildQuery.getRuleName(BuildQueryLexer.SubmittedBy) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.javaindex 52cfca28fd..0d08bd8cde 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java@@ -34,7 +34,7 @@ public class SubmittedByMeCriteria extends EntityCriteria<Build> {}@Override- public String toString() {+ public String asString() {return BuildQuery.getRuleName(BuildQueryLexer.SubmittedByMe);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.javaindex 7c8c7c2f87..4f5e1e07f5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java@@ -26,7 +26,7 @@ public class SuccessfulCriteria extends EntityCriteria<Build> {}@Override- public String toString() {+ public String asString() {return BuildQuery.getRuleName(BuildQueryLexer.Successful);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.javaindex 1ba13ff335..ed609b51f6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java@@ -26,7 +26,7 @@ public class TimedOutCriteria extends EntityCriteria<Build> {}@Override- public String toString() {+ public String asString() {return BuildQuery.getRuleName(BuildQueryLexer.TimedOut);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.javaindex 6abdf88c9c..989e674d21 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.BuildQueryConstants;@@ -35,10 +34,10 @@ public class VersionCriteria extends EntityCriteria<Build> {}@Override- public String toString() {- return BuildQuery.quote(BuildQueryConstants.FIELD_VERSION) + " "+ public String asString() {+ return quote(BuildQueryConstants.FIELD_VERSION) + " "+ BuildQuery.getRuleName(BuildQueryLexer.Is) + " "- + BuildQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionIsEmptyCriteria.javanew file mode 100644index 0000000000..129229b9fb--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionIsEmptyCriteria.java@@ -0,0 +1,30 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.model.Build;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.BuildQueryConstants;++public class VersionIsEmptyCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ return builder.isNull(root.get(BuildQueryConstants.ATTR_VERSION));+ }++ @Override+ public boolean matches(Build build) {+ return build.getVersion() == null;+ }++ @Override+ public String asString() {+ return quote(BuildQueryConstants.FIELD_VERSION) + " " + BuildQuery.getRuleName(BuildQueryLexer.IsEmpty);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.javaindex 83c6fdff5e..885eb18906 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java@@ -26,7 +26,7 @@ public class WaitingCriteria extends EntityCriteria<Build> {}@Override- public String toString() {+ public String asString() {return BuildQuery.getRuleName(BuildQueryLexer.Waiting);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.javaindex 1cac02e79e..99c74ab195 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java@@ -27,13 +27,13 @@ import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.server.OneException;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.AndCriteriaHelper;+import io.onedev.server.search.entity.AndEntityCriteria;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.NotCriteriaHelper;-import io.onedev.server.search.entity.OrCriteriaHelper;+import io.onedev.server.search.entity.NotEntityCriteria;+import io.onedev.server.search.entity.OrEntityCriteria;import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.AndCriteriaContext;import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.CriteriaContext;import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.FieldOperatorValueCriteriaContext;@@ -44,7 +44,7 @@ import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OrCriteimport io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OrderContext;import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.ParensCriteriaContext;import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.QueryContext;-import io.onedev.server.util.ProjectAwareCommitId;+import io.onedev.server.util.ProjectAwareCommit;public class CodeCommentQuery extends EntityQuery<CodeComment> {@@ -73,7 +73,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new OneException("Malformed query syntax", e);+ throw new OneException("Malformed query", e);}});@@ -88,7 +88,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {if (e instanceof OneException)throw e;else- throw new OneException("Malformed query syntax", e);+ throw new OneException("Malformed query", e);}CriteriaContext criteriaContext = queryContext.criteria();EntityCriteria<CodeComment> commentCriteria;@@ -107,14 +107,14 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {if (operator == CodeCommentQueryLexer.CreatedBy) {return new CreatedByCriteria(value);} else {- ProjectAwareCommitId commitId = getCommitId(project, value);+ ProjectAwareCommit commitId = getCommitId(project, value);return new OnCommitCriteria(commitId.getProject(), commitId.getCommitId());}}@Overridepublic EntityCriteria<CodeComment> visitParensCriteria(ParensCriteriaContext ctx) {- return visit(ctx.criteria());+ return (EntityCriteria<CodeComment>) visit(ctx.criteria()).withParens(true);}@Override@@ -167,7 +167,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {List<EntityCriteria<CodeComment>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new OrCriteriaHelper<CodeComment>(childCriterias);+ return new OrEntityCriteria<CodeComment>(childCriterias);}@Override@@ -175,12 +175,12 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {List<EntityCriteria<CodeComment>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new AndCriteriaHelper<CodeComment>(childCriterias);+ return new AndEntityCriteria<CodeComment>(childCriterias);}@Overridepublic EntityCriteria<CodeComment> visitNotCriteria(NotCriteriaContext ctx) {- return new NotCriteriaHelper<CodeComment>(visit(ctx.criteria()));+ return new NotEntityCriteria<CodeComment>(visit(ctx.criteria()));}}.visit(criteriaContext);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.javaindex 23c6fbc4d2..ae34dcb3d6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.CodeCommentQueryConstants;@@ -34,10 +33,10 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {}@Override- public String toString() {- return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_CONTENT) + " "+ public String asString() {+ return quote(CodeCommentQueryConstants.FIELD_CONTENT) + " "+ CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Contains) + " "- + CodeCommentQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.javaindex e5ccc3f920..75a25edf88 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.CodeCommentQueryConstants;@@ -46,9 +45,10 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {}@Override- public String toString() {- return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_CREATE_DATE) + " "- + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);+ public String asString() {+ return quote(CodeCommentQueryConstants.FIELD_CREATE_DATE) + " "+ + CodeCommentQuery.getRuleName(operator) + " "+ + quote(rawValue);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.javaindex 4e596cd951..7a035f166f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java@@ -38,9 +38,8 @@ public class CreatedByCriteria extends EntityCriteria<CodeComment> {}@Override- public String toString() {- return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.CreatedBy)- + " " + CodeCommentQuery.quote(value);+ public String asString() {+ return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.CreatedBy) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.javaindex a20a5a52ee..e8ec362d8c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java@@ -34,7 +34,7 @@ public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {}@Override- public String toString() {+ public String asString() {return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.CreatedByMe);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.javaindex 97c665850c..e93ca2c778 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java@@ -42,8 +42,8 @@ public class OnCommitCriteria extends EntityCriteria<CodeComment> {}@Override- public String toString() {- return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.OnCommit) + " " + CodeCommentQuery.quote(commitId.name());+ public String asString() {+ return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.OnCommit) + " " + quote(commitId.name());}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.javaindex aef1fffe7a..6ef6161886 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.CodeCommentQueryConstants;@@ -36,10 +35,10 @@ public class PathCriteria extends EntityCriteria<CodeComment> {}@Override- public String toString() {- return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_PATH) + " "+ public String asString() {+ return quote(CodeCommentQueryConstants.FIELD_PATH) + " "+ CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Is) + " "- + CodeCommentQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.javaindex c230682824..382dce604a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.CodeCommentQueryConstants;@@ -45,8 +44,10 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {}@Override- public String toString() {- return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_REPLY_COUNT) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(String.valueOf(value));+ public String asString() {+ return quote(CodeCommentQueryConstants.FIELD_REPLY_COUNT) + " "+ + CodeCommentQuery.getRuleName(operator) + " "+ + quote(String.valueOf(value));}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.javaindex a0df6aab93..a377a50e98 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java@@ -42,10 +42,10 @@ public class ReplyCriteria extends EntityCriteria<CodeComment> {}@Override- public String toString() {- return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_REPLY) + " "+ public String asString() {+ return quote(CodeCommentQueryConstants.FIELD_REPLY) + " "+ CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Contains) + " "- + CodeCommentQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.javaindex 1a231dc1bc..d9700ab53a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java@@ -46,10 +46,10 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {}@Override- public String toString() {- return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_UPDATE_DATE) + " "+ public String asString() {+ return quote(CodeCommentQueryConstants.FIELD_UPDATE_DATE) + " "+ CodeCommentQuery.getRuleName(operator) + " "- + CodeCommentQuery.quote(rawValue);+ + quote(rawValue);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.javarename to server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.javaindex 269066ab1c..dc60115a5e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java@@ -12,34 +12,33 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;-import io.onedev.server.search.entity.AndCriteriaHelper;-import io.onedev.server.search.entity.ParensAware;+import io.onedev.server.search.entity.AndEntityCriteria;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;-public class AndCriteria extends IssueCriteria implements ParensAware {+public class AndIssueCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;private final List<IssueCriteria> criterias;- public AndCriteria(List<IssueCriteria> criterias) {+ public AndIssueCriteria(List<IssueCriteria> criterias) {this.criterias = criterias;}@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {- return new AndCriteriaHelper<Issue>(criterias).getPredicate(root, builder);+ return new AndEntityCriteria<Issue>(criterias).getPredicate(root, builder);}@Overridepublic boolean matches(Issue issue) {- return new AndCriteriaHelper<Issue>(criterias).matches(issue);+ return new AndEntityCriteria<Issue>(criterias).matches(issue);}@Override- public String toString() {- return new AndCriteriaHelper<Issue>(criterias).toString();+ public String asString() {+ return new AndEntityCriteria<Issue>(criterias).asString();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.javaindex 1124966894..565c41219c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java@@ -33,8 +33,10 @@ public class BooleanFieldCriteria extends FieldCriteria {}@Override- public String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(String.valueOf(value));+ public String asString() {+ return quote(getFieldName()) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + quote(String.valueOf(value));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.javaindex 528010746b..c27aaaf2f3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java@@ -11,7 +11,6 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.IssueQueryConstants;@@ -43,10 +42,10 @@ public class BuildFieldCriteria extends FieldCriteria {}@Override- public String toString() {- return IssueQuery.quote(getFieldName()) + " "+ public String asString() {+ return quote(getFieldName()) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "- + IssueQuery.quote(value);+ + quote(value);}}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 e2b36aa539..207d03d968 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@@ -72,8 +72,10 @@ public class ChoiceFieldCriteria extends FieldCriteria {}@Override- public String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);+ public String asString() {+ return quote(getFieldName()) + " "+ + IssueQuery.getRuleName(operator) + " "+ + quote(value);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.javaindex 0789743eb2..91d6832bc3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java@@ -44,9 +44,10 @@ public class CommentCountCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_COMMENT_COUNT) + " "- + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ public String asString() {+ return quote(IssueQueryConstants.FIELD_COMMENT_COUNT) + " "+ + IssueQuery.getRuleName(operator) + " "+ + quote(String.valueOf(value));}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.javaindex 5f6af081d1..8c8477b7e5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java@@ -39,9 +39,10 @@ public class CommentCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_COMMENT) + " "- + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);+ public String asString() {+ return quote(IssueQueryConstants.FIELD_COMMENT) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.javanew file mode 100644index 0000000000..97615a3157--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java@@ -0,0 +1,52 @@+package io.onedev.server.search.entity.issue;++import java.util.Objects;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Join;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueField;+import io.onedev.server.model.Project;+import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.ProjectAwareCommit;+import io.onedev.server.util.query.IssueQueryConstants;++public class CommitFieldCriteria extends FieldCriteria {++ private static final long serialVersionUID = 1L;++ private final ProjectAwareCommit commit;++ private final String value;++ public CommitFieldCriteria(String name, @Nullable Project project, String value) {+ super(name);+ commit = EntityQuery.getCommitId(project, value);+ this.value = value;+ }++ @Override+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {+ return builder.and(+ builder.equal(field.getParent().get(IssueQueryConstants.ATTR_PROJECT), commit.getProject()),+ builder.equal(field.get(IssueField.ATTR_VALUE), commit.getCommitId().name()));+ }++ @Override+ public boolean matches(Issue issue) {+ Object fieldValue = issue.getFieldValue(getFieldName());+ return issue.getProject().equals(commit.getProject())+ && Objects.equals(fieldValue, commit.getCommitId().name());+ }++ @Override+ public String asString() {+ return quote(getFieldName()) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + quote(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.javaindex 993b18b99e..2232da4410 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java@@ -46,9 +46,10 @@ public class DateFieldCriteria extends FieldCriteria {}@Override- public String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator)- + " " + IssueQuery.quote(value);+ public String asString() {+ return quote(getFieldName()) + " "+ + IssueQuery.getRuleName(operator) + " "+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.javaindex 2d22f2c1a2..41d7786d1b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java@@ -32,10 +32,10 @@ public class DescriptionCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_DESCRIPTION) + " "+ public String asString() {+ return quote(IssueQueryConstants.FIELD_DESCRIPTION) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "- + IssueQuery.quote(value);+ + quote(value);}}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 6bfcbabd01..8a90c63b6c 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@@ -10,8 +10,11 @@ import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import com.google.common.base.Preconditions;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.support.administration.GlobalIssueSetting;@@ -52,6 +55,11 @@ public abstract class FieldCriteria extends IssueCriteria {}return undefinedFields;}++ public FieldSpec getFieldSpec() {+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);+ return Preconditions.checkNotNull(settingManager.getIssueSetting().getFieldSpec(fieldName));+ }@Overridepublic void onRenameField(String oldField, String newField) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.javaindex 425c806b45..c49d24dbd9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java@@ -1,5 +1,6 @@package io.onedev.server.search.entity.issue;+import java.nio.channels.IllegalSelectorException;import java.util.Collection;import java.util.Objects;import java.util.Set;@@ -11,12 +12,18 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.OneException;+import io.onedev.server.issue.fieldspec.BuildChoiceField;+import io.onedev.server.issue.fieldspec.CommitField;+import io.onedev.server.issue.fieldspec.PullRequestChoiceField;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.ProjectAwareCommit;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.query.IssueQueryConstants;public class FieldOperatorCriteria extends FieldCriteria {@@ -31,29 +38,66 @@ public class FieldOperatorCriteria extends FieldCriteria {@Overrideprotected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {- Path<?> attribute = field.get(IssueField.ATTR_VALUE);+ Path<?> valueAttribute = field.get(IssueField.ATTR_VALUE);+ Path<?> projectAttribute = field.getParent().get(IssueQueryConstants.ATTR_PROJECT);if (operator == IssueQueryLexer.IsEmpty) {- return builder.isNull(attribute);+ return builder.isNull(valueAttribute);} else if (operator == IssueQueryLexer.IsMe) {if (User.get() != null)- return builder.equal(attribute, User.get().getName());+ return builder.equal(valueAttribute, User.get().getName());elsethrow new OneException("Please login to perform this query");- } else {- Build build = Build.get();- if (build != null) {- if (operator == IssueQueryLexer.IsCurrent) {- return builder.equal(attribute, String.valueOf(build.getNumber()));+ } else if (operator == IssueQueryLexer.IsCurrent) {+ if (getFieldSpec() instanceof BuildChoiceField) {+ Build build = Build.get();+ if (build != null) {+ return builder.and(+ builder.equal(projectAttribute, build.getProject()),+ builder.equal(valueAttribute, String.valueOf(build.getNumber())));+ } else {+ throw new OneException("No current build in query context");+ }+ } else if (getFieldSpec() instanceof PullRequestChoiceField) {+ PullRequest request = PullRequest.get();+ if (request != null) {+ return builder.and(+ builder.equal(projectAttribute, request.getTargetProject()),+ builder.equal(valueAttribute, String.valueOf(request.getNumber())));+ } else {+ throw new OneException("No current pull request in query context");+ }+ } else if (getFieldSpec() instanceof CommitField) {+ ProjectAwareCommit commit = ProjectAwareCommit.get();+ if (commit != null) {+ return builder.and(+ builder.equal(projectAttribute, commit.getProject()),+ builder.equal(valueAttribute, commit.getCommitId().name()));+ } else {+ throw new OneException("No current commit in query context");+ }+ } else {+ throw new IllegalStateException();+ }+ } else if (operator == IssueQueryLexer.IsPrevious) {+ if (getFieldSpec() instanceof BuildChoiceField) {+ Build build = Build.get();+ if (build != null) {+ Collection<Long> numbersOfStreamPrevious = Build.get().getNumbersOfStreamPrevious(EntityCriteria.IN_CLAUSE_LIMIT);+ if (!numbersOfStreamPrevious.isEmpty()) {+ return builder.and(+ builder.equal(projectAttribute, build.getProject()),+ valueAttribute.in(numbersOfStreamPrevious.stream().map(it->it.toString()).collect(Collectors.toSet())));+ } else {+ return builder.equal(projectAttribute, build.getProject());+ }} else {- Collection<Long> numbersOfStreamPrevious = build.getNumbersOfStreamPrevious(EntityCriteria.IN_CLAUSE_LIMIT);- if (!numbersOfStreamPrevious.isEmpty())- return attribute.in(numbersOfStreamPrevious.stream().map(it->it.toString()).collect(Collectors.toSet()));- else- return builder.disjunction();+ throw new OneException("No current build in query context");}} else {- throw new OneException("No build in query context");+ throw new IllegalStateException();}+ } else {+ throw new IllegalStateException();}}@@ -67,25 +111,50 @@ public class FieldOperatorCriteria extends FieldCriteria {return Objects.equals(fieldValue, User.get().getName());elsethrow new OneException("Please login to perform this query");- } else {- Build build = Build.get();- if (build != null) {- if (operator == IssueQueryLexer.IsCurrent) {- return build.getId().toString().equals(fieldValue);- } else {- return build.getNumbersOfStreamPrevious(EntityCriteria.IN_CLAUSE_LIMIT)- .stream()- .anyMatch(it->it.equals(fieldValue));+ } else if (operator == IssueQueryLexer.IsCurrent) {+ if (getFieldSpec() instanceof BuildChoiceField) {+ Build build = Build.get();+ if (build != null)+ return build.getProject().equals(issue.getProject()) && build.getId().toString().equals(fieldValue);+ else+ throw new OneException("No build in query context");+ } else if (getFieldSpec() instanceof PullRequestChoiceField) {+ PullRequest request = PullRequest.get();+ if (request != null)+ return request.getTargetProject().equals(issue.getProject()) && request.getId().toString().equals(fieldValue);+ else+ throw new OneException("No pull request in query context");+ } else if (getFieldSpec() instanceof CommitField) {+ ProjectAwareCommit commit = ProjectAwareCommit.get();+ if (commit != null)+ return commit.getProject().equals(issue.getProject()) && commit.getCommitId().name().equals(fieldValue);+ else+ throw new OneException("No commit in query context");+ } else {+ throw new IllegalStateException();+ }+ } else if (operator == IssueQueryLexer.IsPrevious) {+ if (getFieldSpec() instanceof BuildChoiceField) {+ Build build = Build.get();+ if (build != null) {+ return build.getProject().equals(issue.getProject())+ && build.getNumbersOfStreamPrevious(EntityCriteria.IN_CLAUSE_LIMIT)+ .stream()+ .anyMatch(it->it.equals(fieldValue));+ } else {+ throw new OneException("No build in query context");}- } else {- throw new OneException("No build in query context");+ } else {+ throw new IllegalStateException();}+ } else {+ throw new IllegalSelectorException();}}@Override- public String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator);+ public String asString() {+ return quote(getFieldName()) + " " + IssueQuery.getRuleName(operator);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.javaindex fb26adbce1..a4e56413f3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java@@ -1,6 +1,5 @@package io.onedev.server.search.entity.issue;-import static io.onedev.server.search.entity.EntityQuery.quote;import static io.onedev.server.search.entity.issue.IssueQuery.getRuleName;import java.io.IOException;@@ -26,10 +25,9 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.IssueUtils;-import io.onedev.server.util.ProjectAwareCommitId;+import io.onedev.server.util.ProjectAwareCommit;import io.onedev.server.util.query.IssueQueryConstants;public class FixedBetweenCriteria extends IssueCriteria {@@ -57,8 +55,8 @@ public class FixedBetweenCriteria extends IssueCriteria {this.secondType = secondType;this.secondValue = secondValue;- ProjectAwareCommitId first = getCommitId(project, firstType, firstValue);- ProjectAwareCommitId second = getCommitId(project, secondType, secondValue);+ ProjectAwareCommit first = getCommitId(project, firstType, firstValue);+ ProjectAwareCommit second = getCommitId(project, secondType, secondValue);firstCommitId = first.getCommitId();secondCommitId = second.getCommitId();if (first.getProject().equals(second.getProject())) {@@ -69,10 +67,10 @@ public class FixedBetweenCriteria extends IssueCriteria {}}- private static ProjectAwareCommitId getCommitId(@Nullable Project project, int type, String value) {+ private static ProjectAwareCommit getCommitId(@Nullable Project project, int type, String value) {if (type == IssueQueryLexer.Build) {Build build = EntityQuery.getBuild(project, value);- return new ProjectAwareCommitId(build.getProject(), build.getCommitId());+ return new ProjectAwareCommit(build.getProject(), build.getCommitId());} else {return EntityQuery.getCommitId(project, value);}@@ -139,7 +137,7 @@ public class FixedBetweenCriteria extends IssueCriteria {}@Override- public String toString() {+ public String asString() {return getRuleName(IssueQueryLexer.FixedBetween) + " "+ getRuleName(firstType) + " " + quote(firstValue) + " "+ getRuleName(IssueQueryLexer.And) + " "diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.javarename to server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.javaindex 92f55764da..503468ccbb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java@@ -14,7 +14,7 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.IssueQueryConstants;-public class FixedInCriteria extends IssueCriteria {+public class FixedInBuildCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@@ -22,12 +22,12 @@ public class FixedInCriteria extends IssueCriteria {private final String value;- public FixedInCriteria(@Nullable Project project, String value) {+ public FixedInBuildCriteria(@Nullable Project project, String value) {build = EntityQuery.getBuild(project, value);this.value = value;}- public FixedInCriteria(Build build) {+ public FixedInBuildCriteria(Build build) {this.build = build;value = String.valueOf(build.getNumber());}@@ -51,8 +51,8 @@ public class FixedInCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.getRuleName(IssueQueryLexer.FixedInBuild) + " " + IssueQuery.quote(value);+ public String asString() {+ return IssueQuery.getRuleName(IssueQueryLexer.FixedInBuild) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.javanew file mode 100644index 0000000000..bfab76adbd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java@@ -0,0 +1,54 @@+package io.onedev.server.search.entity.issue;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.ProjectAwareCommit;+import io.onedev.server.util.query.IssueQueryConstants;++public class FixedInCommitCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ private final ProjectAwareCommit commit;++ private final String value;++ public FixedInCommitCriteria(@Nullable Project project, String value) {+ commit = EntityQuery.getCommitId(project, value);+ this.value = value;+ }++ public FixedInCommitCriteria(ProjectAwareCommit commit) {+ this.commit = commit;+ value = commit.getCommitId().name();+ }++ @Override+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ if (!commit.getFixedIssueNumbers().isEmpty()) {+ return builder.and(+ builder.equal(root.get(IssueQueryConstants.ATTR_PROJECT), commit.getProject()),+ root.get(IssueQueryConstants.ATTR_NUMBER).in(commit.getFixedIssueNumbers()));+ } else {+ return builder.disjunction();+ }+ }++ @Override+ public boolean matches(Issue issue) {+ return issue.getProject().equals(commit.getProject())+ && commit.getFixedIssueNumbers().contains(issue.getNumber());+ }++ @Override+ public String asString() {+ return IssueQuery.getRuleName(IssueQueryLexer.FixedInCommit) + " " + quote(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.javaindex 571c4fc478..2d44620bbe 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java@@ -8,7 +8,6 @@ import io.onedev.server.OneException;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;-public class FixedInCurrentBuildCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@@ -16,7 +15,7 @@ public class FixedInCurrentBuildCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {if (Build.get() != null)- return new FixedInCriteria(Build.get()).getPredicate(root, builder);+ return new FixedInBuildCriteria(Build.get()).getPredicate(root, builder);elsethrow new OneException("No build in query context");}@@ -24,13 +23,13 @@ public class FixedInCurrentBuildCriteria extends IssueCriteria {@Overridepublic boolean matches(Issue issue) {if (Build.get() != null)- return new FixedInCriteria(Build.get()).matches(issue);+ return new FixedInBuildCriteria(Build.get()).matches(issue);elsethrow new OneException("No build in query context");}@Override- public String toString() {+ public String asString() {return IssueQuery.getRuleName(IssueQueryLexer.FixedInCurrentBuild);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.javanew file mode 100644index 0000000000..1424972b8b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java@@ -0,0 +1,36 @@+package io.onedev.server.search.entity.issue;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.OneException;+import io.onedev.server.model.Issue;+import io.onedev.server.util.ProjectAwareCommit;++public class FixedInCurrentCommitCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ if (ProjectAwareCommit.get() != null)+ return new FixedInCommitCriteria(ProjectAwareCommit.get()).getPredicate(root, builder);+ else+ throw new OneException("No commit id in query context");+ }++ @Override+ public boolean matches(Issue issue) {+ if (ProjectAwareCommit.get() != null)+ return new FixedInCommitCriteria(ProjectAwareCommit.get()).matches(issue);+ else+ throw new OneException("No commit in query context");+ }++ @Override+ public String asString() {+ return IssueQuery.getRuleName(IssueQueryLexer.FixedInCurrentCommit);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.javanew file mode 100644index 0000000000..4574681f13--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java@@ -0,0 +1,36 @@+package io.onedev.server.search.entity.issue;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.OneException;+import io.onedev.server.model.Issue;+import io.onedev.server.model.PullRequest;++public class FixedInCurrentPullRequestCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ if (PullRequest.get() != null)+ return new FixedInPullRequestCriteria(PullRequest.get()).getPredicate(root, builder);+ else+ throw new OneException("No pull request in query context");+ }++ @Override+ public boolean matches(Issue issue) {+ if (PullRequest.get() != null)+ return new FixedInPullRequestCriteria(PullRequest.get()).matches(issue);+ else+ throw new OneException("No pull request in query context");+ }++ @Override+ public String asString() {+ return IssueQuery.getRuleName(IssueQueryLexer.FixedInCurrentPullRequest);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.javanew file mode 100644index 0000000000..b3db11ac5e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java@@ -0,0 +1,57 @@+package io.onedev.server.search.entity.issue;++import java.util.Collection;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.query.IssueQueryConstants;++public class FixedInPullRequestCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ private final PullRequest request;++ private final String value;++ public FixedInPullRequestCriteria(@Nullable Project project, String value) {+ request = EntityQuery.getPullRequest(project, value);+ this.value = value;+ }++ public FixedInPullRequestCriteria(PullRequest request) {+ this.request = request;+ value = String.valueOf(request.getNumber());+ }++ @Override+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ Collection<Long> fixedIssueNumbers = request.getFixedIssueNumbers();+ if (!fixedIssueNumbers.isEmpty()) {+ return builder.and(+ builder.equal(root.get(IssueQueryConstants.ATTR_PROJECT), request.getTargetProject()),+ root.get(IssueQueryConstants.ATTR_NUMBER).in(fixedIssueNumbers));+ } else {+ return builder.disjunction();+ }+ }++ @Override+ public boolean matches(Issue issue) {+ return issue.getProject().equals(request.getTargetProject())+ && request.getFixedIssueNumbers().contains(issue.getNumber());+ }++ @Override+ public String asString() {+ return IssueQuery.getRuleName(IssueQueryLexer.FixedInPullRequest) + " " + quote(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.javaindex 9630d47c86..89fa639315 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java@@ -52,7 +52,7 @@ public abstract class IssueCriteria extends EntityCriteria<Issue> {@Nullablepublic static IssueCriteria of(List<IssueCriteria> criterias) {if (criterias.size() > 1)- return new AndCriteria(criterias);+ return new AndIssueCriteria(criterias);else if (criterias.size() == 1)return criterias.iterator().next();elsediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.javaindex 6377cca100..56cdfb19fd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java@@ -42,10 +42,10 @@ public class IssueFieldCriteria extends FieldCriteria {}@Override- public String toString() {- return IssueQuery.quote(getFieldName()) + " "+ public String asString() {+ return quote(getFieldName()) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "- + IssueQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4index 0201cfd381..f58d85aeaf 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4@@ -7,8 +7,8 @@ query;criteria- : operator=(SubmittedByMe|FixedInCurrentBuild) #OperatorCriteria- | operator=(SubmittedBy|FixedInBuild) WS+ criteriaValue=Quoted #OperatorValueCriteria+ : operator=(SubmittedByMe|FixedInCurrentCommit|FixedInCurrentBuild|FixedInCurrentPullRequest) #OperatorCriteria+ | operator=(SubmittedBy|FixedInCommit|FixedInBuild|FixedInPullRequest) WS+ criteriaValue=Quoted #OperatorValueCriteria| FixedBetween WS+ revisionCriteria WS+ And WS+ revisionCriteria #FixedBetweenCriteria| criteriaField=Quoted WS+ operator=(IsMe|IsEmpty|IsCurrent|IsPrevious) #FieldOperatorCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria@@ -38,6 +38,14 @@ SubmittedBy: 'submitted' WS+ 'by';+FixedInCommit+ : 'fixed' WS+ 'in' WS+ 'commit'+ ;++FixedInCurrentCommit+ : 'fixed' WS+ 'in' WS+ 'current' WS+ 'commit'+ ;+FixedInBuild: 'fixed' WS+ 'in' WS+ 'build';@@ -46,6 +54,14 @@ FixedInCurrentBuild: 'fixed' WS+ 'in' WS+ 'current' WS+ 'build';+FixedInPullRequest+ : 'fixed' WS+ 'in' WS+ 'pull' WS+ 'request'+ ;++FixedInCurrentPullRequest+ : 'fixed' WS+ 'in' WS+ 'current' WS+ 'pull' WS+ 'request'+ ;+IsCurrent: 'is' WS+ 'current';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 c83f5e2676..d95ebcb114 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@@ -25,6 +25,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.issue.fieldspec.BooleanField;import io.onedev.server.issue.fieldspec.BuildChoiceField;import io.onedev.server.issue.fieldspec.ChoiceField;+import io.onedev.server.issue.fieldspec.CommitField;import io.onedev.server.issue.fieldspec.DateField;import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.issue.fieldspec.GroupChoiceField;@@ -85,7 +86,8 @@ public class IssueQuery extends EntityQuery<Issue> {}public static IssueQuery parse(@Nullable Project project, @Nullable String queryString,- boolean validate, boolean withCurrentUserCriteria, boolean withCurrentBuildCriteria) {+ boolean validate, boolean withCurrentUserCriteria, boolean withCurrentBuildCriteria,+ boolean withCurrentPullRequestCriteria, boolean withCurrentCommitCriteria) {if (queryString != null) {CharStream is = CharStreams.fromString(queryString);IssueQueryLexer lexer = new IssueQueryLexer(is);@@ -95,7 +97,7 @@ public class IssueQuery extends EntityQuery<Issue> {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new OneException("Malformed query syntax", e);+ throw new OneException("Malformed query", e);}});@@ -110,7 +112,7 @@ public class IssueQuery extends EntityQuery<Issue> {if (e instanceof OneException)throw e;else- throw new OneException("Malformed query syntax", e);+ throw new OneException("Malformed query", e);}CriteriaContext criteriaContext = queryContext.criteria();IssueCriteria issueCriteria;@@ -133,6 +135,14 @@ public class IssueQuery extends EntityQuery<Issue> {if (!withCurrentBuildCriteria)throw new OneException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new FixedInCurrentBuildCriteria();+ case IssueQueryLexer.FixedInCurrentPullRequest:+ if (!withCurrentPullRequestCriteria)+ throw new OneException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new FixedInCurrentPullRequestCriteria();+ case IssueQueryLexer.FixedInCurrentCommit:+ if (!withCurrentCommitCriteria)+ throw new OneException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new FixedInCurrentCommitCriteria();default:throw new OneException("Unexpected operator: " + ctx.operator.getText());}@@ -142,14 +152,12 @@ public class IssueQuery extends EntityQuery<Issue> {public IssueCriteria visitFieldOperatorCriteria(FieldOperatorCriteriaContext ctx) {String fieldName = getValue(ctx.Quoted().getText());int operator = ctx.operator.getType();- if (validate)- checkField(fieldName, operator);+ if (validate) {+ checkField(fieldName, operator, withCurrentUserCriteria, withCurrentBuildCriteria,+ withCurrentPullRequestCriteria, withCurrentCommitCriteria);+ }if (fieldName.equals(IssueQueryConstants.FIELD_MILESTONE))return new MilestoneIsEmptyCriteria();- else if (operator == IssueQueryLexer.IsMe && !withCurrentUserCriteria)- throw new OneException("Operator '" + getRuleName(operator) + "' is not supported here");- else if ((operator == IssueQueryLexer.IsCurrent || operator == IssueQueryLexer.IsPrevious) && !withCurrentBuildCriteria)- throw new OneException("Operator '" + getRuleName(operator) + "' is not supported here");elsereturn new FieldOperatorCriteria(fieldName, operator);}@@ -159,7 +167,11 @@ public class IssueQuery extends EntityQuery<Issue> {if (ctx.SubmittedBy() != null)return new SubmittedByCriteria(value);else if (ctx.FixedInBuild() != null)- return new FixedInCriteria(project, value);+ return new FixedInBuildCriteria(project, value);+ else if (ctx.FixedInPullRequest() != null)+ return new FixedInPullRequestCriteria(project, value);+ else if (ctx.FixedInCommit() != null)+ return new FixedInCommitCriteria(project, value);elsethrow new RuntimeException("Unexpected operator: " + ctx.operator.getText());}@@ -179,7 +191,7 @@ public class IssueQuery extends EntityQuery<Issue> {@Overridepublic IssueCriteria visitParensCriteria(ParensCriteriaContext ctx) {- return visit(ctx.criteria());+ return (IssueCriteria) visit(ctx.criteria()).withParens(true);}@Override@@ -187,8 +199,10 @@ public class IssueQuery extends EntityQuery<Issue> {String fieldName = getValue(ctx.Quoted(0).getText());String value = getValue(ctx.Quoted(1).getText());int operator = ctx.operator.getType();- if (validate)- checkField(fieldName, operator);+ if (validate) {+ checkField(fieldName, operator, withCurrentUserCriteria, withCurrentBuildCriteria,+ withCurrentPullRequestCriteria, withCurrentCommitCriteria);+ }switch (operator) {case IssueQueryLexer.IsBefore:@@ -240,6 +254,8 @@ public class IssueQuery extends EntityQuery<Issue> {return new BuildFieldCriteria(fieldName, project, value);} else if (field instanceof PullRequestChoiceField) {return new PullRequestFieldCriteria(fieldName, project, value);+ } else if (field instanceof CommitField) {+ return new CommitFieldCriteria(fieldName, project, value);} else if (field instanceof BooleanField) {return new BooleanFieldCriteria(fieldName, getBooleanValue(value));} else if (field instanceof NumberField) {@@ -285,7 +301,7 @@ public class IssueQuery extends EntityQuery<Issue> {List<IssueCriteria> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new OrCriteria(childCriterias);+ return new OrIssueCriteria(childCriterias);}@Override@@ -293,12 +309,12 @@ public class IssueQuery extends EntityQuery<Issue> {List<IssueCriteria> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new AndCriteria(childCriterias);+ return new AndIssueCriteria(childCriterias);}@Overridepublic IssueCriteria visitNotCriteria(NotCriteriaContext ctx) {- return new NotCriteria(visit(ctx.criteria()));+ return new NotIssueCriteria(visit(ctx.criteria()));}}.visit(criteriaContext);@@ -343,7 +359,9 @@ public class IssueQuery extends EntityQuery<Issue> {return new OneException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");}- public static void checkField(String fieldName, int operator) {+ public static void checkField(String fieldName, int operator,+ boolean withCurrentUserCriteria, boolean withCurrentBuildCriteria,+ boolean withCurrentPullRequestCriteria, boolean withCurrentCommitCriteria) {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);if (fieldSpec == null && !IssueQueryConstants.QUERY_FIELDS.contains(fieldName))throw new OneException("Field not found: " + fieldName);@@ -355,12 +373,17 @@ public class IssueQuery extends EntityQuery<Issue> {}break;case IssueQueryLexer.IsMe:- if (!(fieldSpec instanceof UserChoiceField))+ if (!(fieldSpec instanceof UserChoiceField && withCurrentUserCriteria))throw newOperatorException(fieldName, operator);break;case IssueQueryLexer.IsCurrent:+ if (!(fieldSpec instanceof BuildChoiceField && withCurrentBuildCriteria+ || fieldSpec instanceof PullRequestChoiceField && withCurrentPullRequestCriteria)+ || fieldSpec instanceof CommitField && withCurrentCommitCriteria)+ throw newOperatorException(fieldName, operator);+ break;case IssueQueryLexer.IsPrevious:- if (!(fieldSpec instanceof BuildChoiceField))+ if (!(fieldSpec instanceof BuildChoiceField && withCurrentBuildCriteria))throw newOperatorException(fieldName, operator);break;case IssueQueryLexer.IsBefore:@@ -392,6 +415,7 @@ public class IssueQuery extends EntityQuery<Issue> {&& !(fieldSpec instanceof BuildChoiceField)&& !(fieldSpec instanceof BooleanField)&& !(fieldSpec instanceof NumberField)+ && !(fieldSpec instanceof CommitField)&& !(fieldSpec instanceof ChoiceField)&& !(fieldSpec instanceof UserChoiceField)&& !(fieldSpec instanceof GroupChoiceField)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.javaindex 71a179c0bb..1451637a96 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java@@ -39,10 +39,10 @@ public class MilestoneCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_MILESTONE) + " "+ public String asString() {+ return quote(IssueQueryConstants.FIELD_MILESTONE) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "- + IssueQuery.quote(milestoneName);+ + quote(milestoneName);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.javaindex 0222dd5a57..448ac6a397 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java@@ -24,8 +24,8 @@ public class MilestoneIsEmptyCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_MILESTONE) + " "+ public String asString() {+ return quote(IssueQueryConstants.FIELD_MILESTONE) + " "+ IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.javasimilarity index 81%rename from server-core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.javarename to server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.javaindex 18da56bd0e..9f3bd19bfc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.java@@ -8,33 +8,33 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;-import io.onedev.server.search.entity.NotCriteriaHelper;+import io.onedev.server.search.entity.NotEntityCriteria;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;-public class NotCriteria extends IssueCriteria {+public class NotIssueCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;private final IssueCriteria criteria;- public NotCriteria(IssueCriteria criteria) {+ public NotIssueCriteria(IssueCriteria criteria) {this.criteria = criteria;}@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {- return new NotCriteriaHelper<Issue>(criteria).getPredicate(root, builder);+ return new NotEntityCriteria<Issue>(criteria).getPredicate(root, builder);}@Overridepublic boolean matches(Issue issue) {- return new NotCriteriaHelper<Issue>(criteria).matches(issue);+ return new NotEntityCriteria<Issue>(criteria).matches(issue);}@Override- public String toString() {- return new NotCriteriaHelper<Issue>(criteria).toString();+ public String asString() {+ return new NotEntityCriteria<Issue>(criteria).asString();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.javaindex 763a7a57d2..f027181c20 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java@@ -61,10 +61,10 @@ public class NumberCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_NUMBER) + " "+ public String asString() {+ return quote(IssueQueryConstants.FIELD_NUMBER) + " "+ IssueQuery.getRuleName(operator) + " "- + IssueQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.javaindex e6261e4d47..e338efb6b0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java@@ -49,9 +49,10 @@ public class NumericFieldCriteria extends FieldCriteria {}@Override- public String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " "- + IssueQuery.quote(String.valueOf(value));+ public String asString() {+ return quote(getFieldName()) + " "+ + IssueQuery.getRuleName(operator) + " "+ + quote(String.valueOf(value));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.javasimilarity index 85%rename from server-core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.javarename to server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.javaindex a2b78f7205..1e0a6befc1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java@@ -12,35 +12,33 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;--import io.onedev.server.search.entity.OrCriteriaHelper;-import io.onedev.server.search.entity.ParensAware;+import io.onedev.server.search.entity.OrEntityCriteria;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;-public class OrCriteria extends IssueCriteria implements ParensAware {+public class OrIssueCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;private final List<IssueCriteria> criterias;- public OrCriteria(List<IssueCriteria> criterias) {+ public OrIssueCriteria(List<IssueCriteria> criterias) {this.criterias = criterias;}@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {- return new OrCriteriaHelper<Issue>(criterias).getPredicate(root, builder);+ return new OrEntityCriteria<Issue>(criterias).getPredicate(root, builder);}@Overridepublic boolean matches(Issue issue) {- return new OrCriteriaHelper<Issue>(criterias).matches(issue);+ return new OrEntityCriteria<Issue>(criterias).matches(issue);}@Override- public String toString() {- return new OrCriteriaHelper<Issue>(criterias).toString();+ public String asString() {+ return new OrEntityCriteria<Issue>(criterias).asString();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.javaindex ac61b05fdb..17616b84ef 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java@@ -37,10 +37,10 @@ public class ProjectCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_PROJECT) + " "+ public String asString() {+ return quote(IssueQueryConstants.FIELD_PROJECT) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "- + IssueQuery.quote(projectName);+ + quote(projectName);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.javaindex 20fddbd2e5..7415af8443 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java@@ -43,10 +43,10 @@ public class PullRequestFieldCriteria extends FieldCriteria {}@Override- public String toString() {- return IssueQuery.quote(getFieldName()) + " "+ public String asString() {+ return quote(getFieldName()) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "- + IssueQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.javaindex d5e9427289..6a89d82800 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java@@ -43,9 +43,10 @@ public class StateCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_STATE) + " "- + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);+ public String asString() {+ return quote(IssueQueryConstants.FIELD_STATE) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + quote(value);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.javaindex 01c79b3994..d7da86e915 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java@@ -48,8 +48,10 @@ public class StringFieldCriteria extends FieldCriteria {}@Override- public String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);+ public String asString() {+ return quote(getFieldName()) + " "+ + IssueQuery.getRuleName(operator) + " "+ + quote(value);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.javaindex 200a1ef353..1dbc970075 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java@@ -46,9 +46,10 @@ public class SubmitDateCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_SUBMIT_DATE) + " "- + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);+ public String asString() {+ return quote(IssueQueryConstants.FIELD_SUBMIT_DATE) + " "+ + IssueQuery.getRuleName(operator) + " "+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.javaindex d80819bfbb..62d5375ef2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java@@ -38,8 +38,8 @@ public class SubmittedByCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.getRuleName(IssueQueryLexer.SubmittedBy) + " " + IssueQuery.quote(value);+ public String asString() {+ return IssueQuery.getRuleName(IssueQueryLexer.SubmittedBy) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.javaindex 95fc6c3986..c78183317b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java@@ -33,7 +33,7 @@ public class SubmittedByMeCriteria extends IssueCriteria {}@Override- public String toString() {+ public String asString() {return IssueQuery.getRuleName(IssueQueryLexer.SubmittedByMe);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.javaindex db32e4deee..f077c7a16e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java@@ -32,10 +32,10 @@ public class TitleCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_TITLE) + " "+ public String asString() {+ return quote(IssueQueryConstants.FIELD_TITLE) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "- + IssueQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.javaindex 979de34a62..1f088929c5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java@@ -46,9 +46,10 @@ public class UpdateDateCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_UPDATE_DATE) + " "- + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);+ public String asString() {+ return quote(IssueQueryConstants.FIELD_UPDATE_DATE) + " "+ + IssueQuery.getRuleName(operator) + " "+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.javaindex 181ef1147b..78eeb698b8 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java@@ -44,10 +44,10 @@ public class VoteCountCriteria extends IssueCriteria {}@Override- public String toString() {- return IssueQuery.quote(IssueQueryConstants.FIELD_VOTE_COUNT) + " "+ public String asString() {+ return quote(IssueQueryConstants.FIELD_VOTE_COUNT) + " "+ IssueQuery.getRuleName(operator) + " "- + IssueQuery.quote(String.valueOf(value));+ + quote(String.valueOf(value));}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/AndCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/AndCriteria.javadeleted file mode 100644index 65ac79fcfc..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/project/AndCriteria.java+++ /dev/null@@ -1,39 +0,0 @@-package io.onedev.server.search.entity.project;--import java.util.List;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.Project;-import io.onedev.server.search.entity.AndCriteriaHelper;-import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.search.entity.ParensAware;--public class AndCriteria extends EntityCriteria<Project> implements ParensAware {-- private static final long serialVersionUID = 1L;-- private final List<EntityCriteria<Project>> criterias;-- public AndCriteria(List<EntityCriteria<Project>> criterias) {- this.criterias = criterias;- }-- @Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {- return new AndCriteriaHelper<Project>(criterias).getPredicate(root, builder);- }-- @Override- public boolean matches(Project project) {- return new AndCriteriaHelper<Project>(criterias).matches(project);- }-- @Override- public String toString() {- return new AndCriteriaHelper<Project>(criterias).toString();- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.javaindex bfe38a6b03..430a9a4e12 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.ProjectQueryConstants;@@ -34,10 +34,10 @@ public class DescriptionCriteria extends EntityCriteria<Project> {}@Override- public String toString() {- return ProjectQuery.quote(ProjectQueryConstants.FIELD_DESCRIPTION) + " "+ public String asString() {+ return Criteria.quote(ProjectQueryConstants.FIELD_DESCRIPTION) + " "+ ProjectQuery.getRuleName(ProjectQueryLexer.Contains) + " "- + ProjectQuery.quote(value);+ + Criteria.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.javaindex 2579fc5a15..3ddccc1c4a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java@@ -7,8 +7,8 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.ProjectQueryConstants;@@ -43,8 +43,8 @@ public class ForksOfCriteria extends EntityCriteria<Project> {}@Override- public String toString() {- return ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " " + ProjectQuery.quote(projectName);+ public String asString() {+ return ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " " + Criteria.quote(projectName);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.javaindex 2273c5371f..3833ec4e34 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.ProjectQueryConstants;@@ -35,10 +35,10 @@ public class NameCriteria extends EntityCriteria<Project> {}@Override- public String toString() {- return ProjectQuery.quote(ProjectQueryConstants.FIELD_NAME) + " "+ public String asString() {+ return Criteria.quote(ProjectQueryConstants.FIELD_NAME) + " "+ ProjectQuery.getRuleName(ProjectQueryLexer.Is) + " "- + ProjectQuery.quote(value);+ + Criteria.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NotCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NotCriteria.javadeleted file mode 100644index 6633f3c6af..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/project/NotCriteria.java+++ /dev/null@@ -1,37 +0,0 @@-package io.onedev.server.search.entity.project;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.Project;--import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.search.entity.NotCriteriaHelper;--public class NotCriteria extends EntityCriteria<Project> {-- private static final long serialVersionUID = 1L;-- private final EntityCriteria<Project> criteria;-- public NotCriteria(EntityCriteria<Project> criteria) {- this.criteria = criteria;- }-- @Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {- return new NotCriteriaHelper<Project>(criteria).getPredicate(root, builder);- }-- @Override- public boolean matches(Project project) {- return new NotCriteriaHelper<Project>(criteria).matches(project);- }-- @Override- public String toString() {- return new NotCriteriaHelper<Project>(criteria).toString();- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OrCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OrCriteria.javadeleted file mode 100644index 1cb3dea163..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OrCriteria.java+++ /dev/null@@ -1,40 +0,0 @@-package io.onedev.server.search.entity.project;--import java.util.List;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.Project;--import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.search.entity.OrCriteriaHelper;-import io.onedev.server.search.entity.ParensAware;--public class OrCriteria extends EntityCriteria<Project> implements ParensAware {-- private static final long serialVersionUID = 1L;-- private final List<EntityCriteria<Project>> criterias;-- public OrCriteria(List<EntityCriteria<Project>> criterias) {- this.criterias = criterias;- }-- @Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {- return new OrCriteriaHelper<Project>(criterias).getPredicate(root, builder);- }-- @Override- public boolean matches(Project project) {- return new OrCriteriaHelper<Project>(criterias).matches(project);- }-- @Override- public String toString() {- return new OrCriteriaHelper<Project>(criterias).toString();- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.javaindex c8b7986f24..11d521135f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java@@ -7,9 +7,9 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.query.ProjectQueryConstants;public class OwnedByCriteria extends EntityCriteria<Project> {@@ -37,8 +37,8 @@ public class OwnedByCriteria extends EntityCriteria<Project> {}@Override- public String toString() {- return ProjectQuery.getRuleName(ProjectQueryLexer.OwnedBy) + " " + ProjectQuery.quote(value);+ public String asString() {+ return ProjectQuery.getRuleName(ProjectQueryLexer.OwnedBy) + " " + Criteria.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.javaindex 44236b1e74..4cf81e7773 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java@@ -33,7 +33,7 @@ public class OwnedByMeCriteria extends EntityCriteria<Project> {}@Override- public String toString() {+ public String asString() {return ProjectQuery.getRuleName(ProjectQueryLexer.OwnedByMe);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.javaindex 49b5c412b1..361f89d4c1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java@@ -16,10 +16,13 @@ import org.antlr.v4.runtime.Recognizer;import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.server.OneException;import io.onedev.server.model.Project;+import io.onedev.server.search.entity.AndEntityCriteria;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;+import io.onedev.server.search.entity.NotEntityCriteria;+import io.onedev.server.search.entity.OrEntityCriteria;import io.onedev.server.search.entity.project.ProjectQueryParser.AndCriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.CriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.FieldOperatorValueCriteriaContext;@@ -68,7 +71,7 @@ public class ProjectQuery extends EntityQuery<Project> {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new OneException("Malformed query syntax", e);+ throw new OneException("Malformed query", e);}});@@ -83,7 +86,7 @@ public class ProjectQuery extends EntityQuery<Project> {if (e instanceof OneException)throw e;else- throw new OneException("Malformed query syntax", e);+ throw new OneException("Malformed query", e);}CriteriaContext criteriaContext = queryContext.criteria();EntityCriteria<Project> projectCriteria;@@ -105,7 +108,7 @@ public class ProjectQuery extends EntityQuery<Project> {@Overridepublic EntityCriteria<Project> visitParensCriteria(ParensCriteriaContext ctx) {- return visit(ctx.criteria());+ return (EntityCriteria<Project>) visit(ctx.criteria()).withParens(true);}@Override@@ -133,7 +136,7 @@ public class ProjectQuery extends EntityQuery<Project> {List<EntityCriteria<Project>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new OrCriteria(childCriterias);+ return new OrEntityCriteria<Project>(childCriterias);}@Override@@ -141,12 +144,12 @@ public class ProjectQuery extends EntityQuery<Project> {List<EntityCriteria<Project>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new AndCriteria(childCriterias);+ return new AndEntityCriteria<Project>(childCriterias);}@Overridepublic EntityCriteria<Project> visitNotCriteria(NotCriteriaContext ctx) {- return new NotCriteria(visit(ctx.criteria()));+ return new NotEntityCriteria<Project>(visit(ctx.criteria()));}}.visit(criteriaContext);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.javaindex aec643f56e..18e4037093 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java@@ -8,9 +8,9 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.query.ProjectQueryConstants;public class UpdateDateCriteria extends EntityCriteria<Project> {@@ -47,9 +47,10 @@ public class UpdateDateCriteria extends EntityCriteria<Project> {}@Override- public String toString() {- return ProjectQuery.quote(ProjectQueryConstants.FIELD_UPDATE_DATE) + " "- + ProjectQuery.getRuleName(operator) + " " + ProjectQuery.quote(value);+ public String asString() {+ return Criteria.quote(ProjectQueryConstants.FIELD_UPDATE_DATE) + " "+ + ProjectQuery.getRuleName(operator) + " "+ + Criteria.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.javadeleted file mode 100644index cd8756831b..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java+++ /dev/null@@ -1,40 +0,0 @@-package io.onedev.server.search.entity.pullrequest;--import java.util.List;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.PullRequest;--import io.onedev.server.search.entity.AndCriteriaHelper;-import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.search.entity.ParensAware;--public class AndCriteria extends EntityCriteria<PullRequest> implements ParensAware {-- private static final long serialVersionUID = 1L;-- private final List<EntityCriteria<PullRequest>> criterias;-- public AndCriteria(List<EntityCriteria<PullRequest>> criterias) {- this.criterias = criterias;- }-- @Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {- return new AndCriteriaHelper<PullRequest>(criterias).getPredicate(root, builder);- }-- @Override- public boolean matches(PullRequest request) {- return new AndCriteriaHelper<PullRequest>(criterias).matches(request);- }-- @Override- public String toString() {- return new AndCriteriaHelper<PullRequest>(criterias).toString();- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.javaindex f5df1bf81b..2c7733eca3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java@@ -48,9 +48,9 @@ public class ApprovedByCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedBy) + " "- + PullRequestQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.javaindex e71ba9e05d..a221fe535e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java@@ -50,7 +50,7 @@ public class ApprovedByMeCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedByMe);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.javaindex 8913879a3b..678e1a821c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -51,9 +50,10 @@ public class CloseDateCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_CLOSE_DATE) + " "- + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(value);+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_CLOSE_DATE) + " "+ + PullRequestQuery.getRuleName(operator) + " "+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.javaindex 2decf58b8f..e66a6145f7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -45,8 +44,10 @@ public class CommentCountCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_COMMENT_COUNT) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(String.valueOf(value));+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_COMMENT_COUNT) + " "+ + PullRequestQuery.getRuleName(operator) + " "+ + quote(String.valueOf(value));}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.javaindex 5dd4324b37..47614f4b70 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java@@ -40,10 +40,10 @@ public class CommentCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_COMMENT) + " "+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_COMMENT) + " "+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " "- + PullRequestQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.javaindex eeb441acfc..d8b95408bb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -34,9 +33,10 @@ public class DescriptionCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_DESCRIPTION) + " "- + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " " + PullRequestQuery.quote(value);+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_DESCRIPTION) + " "+ + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " "+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.javaindex d44e44943a..d970e5e6ae 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java@@ -9,7 +9,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -39,9 +38,8 @@ public class DiscardedByCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.DiscardedBy)- + " " + PullRequestQuery.quote(value);+ public String asString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.DiscardedBy) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.javaindex d5af85d190..18afb5728d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java@@ -35,7 +35,7 @@ public class DiscardedByMeCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.DiscardedByMe);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.javaindex caf3ceabe7..b9e527817e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java@@ -28,7 +28,7 @@ public class DiscardedCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.Discarded);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.javaindex bcda197c25..aee83cf5cf 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java@@ -44,7 +44,7 @@ public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasFailedBuilds);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.javaindex d4ca3a9484..a35b722659 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java@@ -31,7 +31,7 @@ public class HasMergeConflictsCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasMergeConflicts);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.javaindex be417fe04a..7598da7eae 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java@@ -40,7 +40,7 @@ public class HasPendingReviewsCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasPendingReviews);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.javaindex c569b80ca9..dac982a5f6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java@@ -13,10 +13,9 @@ import io.onedev.server.OneDev;import io.onedev.server.infomanager.CodeCommentRelationInfoManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.ProjectAwareCommitId;+import io.onedev.server.util.ProjectAwareCommit;import io.onedev.server.util.query.PullRequestQueryConstants;public class IncludesCommitCriteria extends EntityCriteria<PullRequest> {@@ -30,7 +29,7 @@ public class IncludesCommitCriteria extends EntityCriteria<PullRequest> {private final String value;public IncludesCommitCriteria(@Nullable Project project, String value) {- ProjectAwareCommitId commitId = EntityQuery.getCommitId(project, value);+ ProjectAwareCommit commitId = EntityQuery.getCommitId(project, value);this.project = commitId.getProject();this.commitId = commitId.getCommitId();this.value = value;@@ -58,9 +57,8 @@ public class IncludesCommitCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.IncludesCommit) + " "- + PullRequestQuery.quote(value);+ public String asString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.IncludesCommit) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.javaindex f3cd2105c5..194d1f22b4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java@@ -16,7 +16,6 @@ import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -60,9 +59,8 @@ public class IncludesIssueCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.IncludesIssue) + " "- + PullRequestQuery.quote(value);+ public String asString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.IncludesIssue) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.javaindex 005ba55e3a..008733f794 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java@@ -7,7 +7,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -33,10 +32,10 @@ public class MergeStrategyCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_MERGE_STRATEGY) + " "+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_MERGE_STRATEGY) + " "+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "- + PullRequestQuery.quote(value.toString());+ + quote(value.toString());}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.javaindex d5663476a9..111c6168fb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java@@ -28,7 +28,7 @@ public class MergedCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.Merged);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.javadeleted file mode 100644index bea88f8c27..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java+++ /dev/null@@ -1,37 +0,0 @@-package io.onedev.server.search.entity.pullrequest;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.PullRequest;--import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.search.entity.NotCriteriaHelper;--public class NotCriteria extends EntityCriteria<PullRequest> {-- private static final long serialVersionUID = 1L;-- private final EntityCriteria<PullRequest> criteria;-- public NotCriteria(EntityCriteria<PullRequest> criteria) {- this.criteria = criteria;- }-- @Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {- return new NotCriteriaHelper<PullRequest>(criteria).getPredicate(root, builder);- }-- @Override- public boolean matches(PullRequest request) {- return new NotCriteriaHelper<PullRequest>(criteria).matches(request);- }-- @Override- public String toString() {- return new NotCriteriaHelper<PullRequest>(criteria).toString();- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.javaindex de6aba5ba5..34a991164e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java@@ -8,7 +8,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectScopedNumber;@@ -62,10 +61,10 @@ public class NumberCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_NUMBER) + " "+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_NUMBER) + " "+ PullRequestQuery.getRuleName(operator) + " "- + PullRequestQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.javaindex e87e6b452d..c1da7c5e9c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java@@ -27,7 +27,7 @@ public class OpenCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.Open);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.javadeleted file mode 100644index b0b72f30aa..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java+++ /dev/null@@ -1,40 +0,0 @@-package io.onedev.server.search.entity.pullrequest;--import java.util.List;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.PullRequest;--import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.search.entity.OrCriteriaHelper;-import io.onedev.server.search.entity.ParensAware;--public class OrCriteria extends EntityCriteria<PullRequest> implements ParensAware {-- private static final long serialVersionUID = 1L;-- private final List<EntityCriteria<PullRequest>> criterias;-- public OrCriteria(List<EntityCriteria<PullRequest>> criterias) {- this.criterias = criterias;- }-- @Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {- return new OrCriteriaHelper<PullRequest>(criterias).getPredicate(root, builder);- }-- @Override- public boolean matches(PullRequest request) {- return new OrCriteriaHelper<PullRequest>(criterias).matches(request);- }-- @Override- public String toString() {- return new OrCriteriaHelper<PullRequest>(criterias).toString();- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex e43c5d2d87..2939b9e0fb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -18,10 +18,13 @@ import io.onedev.server.OneException;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.search.entity.AndEntityCriteria;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;+import io.onedev.server.search.entity.NotEntityCriteria;+import io.onedev.server.search.entity.OrEntityCriteria;import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.AndCriteriaContext;import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.CriteriaContext;import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.FieldOperatorValueCriteriaContext;@@ -61,7 +64,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new OneException("Malformed query syntax", e);+ throw new OneException("Malformed query", e);}});@@ -76,7 +79,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {if (e instanceof OneException)throw e;else- throw new OneException("Malformed query syntax", e);+ throw new OneException("Malformed query", e);}CriteriaContext criteriaContext = queryContext.criteria();EntityCriteria<PullRequest> requestCriteria;@@ -142,7 +145,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {@Overridepublic EntityCriteria<PullRequest> visitParensCriteria(ParensCriteriaContext ctx) {- return visit(ctx.criteria());+ return (EntityCriteria<PullRequest>) visit(ctx.criteria()).withParens(true);}@Override@@ -215,7 +218,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {List<EntityCriteria<PullRequest>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new OrCriteria(childCriterias);+ return new OrEntityCriteria<PullRequest>(childCriterias);}@Override@@ -223,12 +226,12 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {List<EntityCriteria<PullRequest>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new AndCriteria(childCriterias);+ return new AndEntityCriteria<PullRequest>(childCriterias);}@Overridepublic EntityCriteria<PullRequest> visitNotCriteria(NotCriteriaContext ctx) {- return new NotCriteria(visit(ctx.criteria()));+ return new NotEntityCriteria<PullRequest>(visit(ctx.criteria()));}}.visit(criteriaContext);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.javaindex 1954704711..d1bc42fdf5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java@@ -48,9 +48,8 @@ public class RequestedForChangesByCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.RequestedForChangesBy)- + " " + PullRequestQuery.quote(value);+ public String asString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.RequestedForChangesBy) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.javaindex 879bc7bffb..a1c281b6b8 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java@@ -50,7 +50,7 @@ public class RequestedForChangesByMeCriteria extends EntityCriteria<PullRequest>}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.RequestedForChangesByMe);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.javaindex 7ca263d2f3..6ab5a894bc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java@@ -40,7 +40,7 @@ public class SomeoneRequestedForChangesCriteria extends EntityCriteria<PullReque}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.SomeoneRequestedForChanges);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.javaindex 474ad6f3c0..f18bdb6988 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -34,10 +33,10 @@ public class SourceBranchCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_SOURCE_BRANCH) + " "+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_SOURCE_BRANCH) + " "+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "- + PullRequestQuery.quote(branch);+ + quote(branch);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.javaindex e677ba9d1c..468e9d2eb0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java@@ -8,7 +8,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.ProjectQueryConstants;@@ -45,10 +44,10 @@ public class SourceProjectCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_SOURCE_PROJECT) + " "+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_SOURCE_PROJECT) + " "+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "- + PullRequestQuery.quote(projectName);+ + quote(projectName);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.javaindex 00cf879b21..b7821ec6bf 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java@@ -7,7 +7,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.CloseInfo;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -39,8 +38,10 @@ public class StatusCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_STATUS) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_STATUS) + " "+ + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.javaindex 57ca74720d..37aa436dca 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -47,9 +46,10 @@ public class SubmitDateCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_SUBMIT_DATE) + " "- + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(value);+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_SUBMIT_DATE) + " "+ + PullRequestQuery.getRuleName(operator) + " "+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.javaindex cfb120a836..9a3c754d55 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java@@ -9,7 +9,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -39,9 +38,8 @@ public class SubmittedByCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedBy) +- " " + PullRequestQuery.quote(value);+ public String asString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedBy) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.javaindex 661131be79..9648a37c93 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java@@ -34,7 +34,7 @@ public class SubmittedByMeCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedByMe);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.javaindex ae23f20c50..6f566ced9c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -34,10 +33,10 @@ public class TargetBranchCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_TARGET_BRANCH) + " "+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_TARGET_BRANCH) + " "+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "- + PullRequestQuery.quote(branch);+ + quote(branch);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.javaindex 15ff7b48a2..e346bb6475 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java@@ -7,7 +7,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.ProjectQueryConstants;@@ -39,10 +38,10 @@ public class TargetProjectCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_TARGET_PROJECT) + " "+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_TARGET_PROJECT) + " "+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "- + PullRequestQuery.quote(projectName);+ + quote(projectName);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.javaindex f61a46ba66..a61cb57e86 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -34,10 +33,10 @@ public class TitleCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_TITLE) + " "+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_TITLE) + " "+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " "- + PullRequestQuery.quote(value);+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.javaindex 17f5b6e228..e5b09d8c0b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java@@ -47,9 +47,8 @@ public class ToBeReviewedByCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeReviewedBy)- + " " + PullRequestQuery.quote(value);+ public String asString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeReviewedBy) + " " + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.javaindex 54ca8a2e3e..8811057bbd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java@@ -49,7 +49,7 @@ public class ToBeReviewedByMeCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeReviewedByMe);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.javaindex eab019d96c..f0cef1113d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java@@ -44,7 +44,7 @@ public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {+ public String asString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeVerifiedByBuilds);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.javaindex 37d9b9744e..5faf1f0caa 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.PullRequestQueryConstants;@@ -47,9 +46,10 @@ public class UpdateDateCriteria extends EntityCriteria<PullRequest> {}@Override- public String toString() {- return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_UPDATE_DATE) + " "- + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(value);+ public String asString() {+ return quote(PullRequestQueryConstants.FIELD_UPDATE_DATE) + " "+ + PullRequestQuery.getRuleName(operator) + " "+ + quote(value);}}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 dab770828b..39f5bec6d0 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@@ -27,6 +27,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.google.common.collect.Sets;+import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.StringUtils;@@ -107,7 +109,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {for (Project project: projectManager.query()) {permissions.add(new ProjectPermission(project, new ReadCode()));for (FieldSpec field: OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs())- permissions.add(new ProjectPermission(project, new EditIssueField(field.getName())));+ permissions.add(new ProjectPermission(project, new EditIssueField(Sets.newHashSet(field.getName()))));permissions.add(new ProjectPermission(project, new JobPermission("*", new AccessBuildLog())));}}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.javaindex b59d0395aa..f79c3a033e 100644--- a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java+++ b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java@@ -17,7 +17,7 @@ public class AccessBuildReports implements Permission {private PatternSet getReportNamesPatternSet() {if (reportNamesPatternSet == null)- reportNamesPatternSet = PatternSet.fromString(reportNames);+ reportNamesPatternSet = PatternSet.parse(reportNames);return reportNamesPatternSet;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.javaindex 2256de008e..0e68996656 100644--- a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java+++ b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueField.java@@ -1,22 +1,22 @@package io.onedev.server.security.permission;-import javax.annotation.Nullable;+import java.util.Collection;import org.apache.shiro.authz.Permission;public class EditIssueField implements Permission {- private final String fieldName;+ private final Collection<String> fields;- public EditIssueField(@Nullable String fieldName) {- this.fieldName = fieldName;+ public EditIssueField(Collection<String> fields) {+ this.fields = fields;}@Overridepublic boolean implies(Permission p) {if (p instanceof EditIssueField) {EditIssueField editIssueField = (EditIssueField) p;- return fieldName == null || fieldName.equals(editIssueField.fieldName);+ return fields.containsAll(editIssueField.fields);} else {return new AccessProject().implies(p);}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java b/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.javaindex 4d9c4e7a19..719c5d4493 100644--- a/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java+++ b/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java@@ -20,7 +20,7 @@ public class JobPermission implements Permission {private PatternSet getJobNamesPatternSet() {if (jobNamesPatternSet == null)- jobNamesPatternSet = PatternSet.fromString(jobNames);+ jobNamesPatternSet = PatternSet.parse(jobNames);return jobNamesPatternSet;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/util/BuildCommitAware.java b/server-core/src/main/java/io/onedev/server/util/BuildCommitAware.javadeleted file mode 100644index d7fccb98ee..0000000000--- a/server-core/src/main/java/io/onedev/server/util/BuildCommitAware.java+++ /dev/null@@ -1,9 +0,0 @@-package io.onedev.server.util;--import org.eclipse.jgit.lib.ObjectId;--public interface BuildCommitAware {-- ObjectId getBuildCommit();--}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..ada5eed3f8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/CommitAware.java@@ -0,0 +1,7 @@+package io.onedev.server.util;++public interface CommitAware {++ ProjectAwareCommit getCommit();++}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 35fba97eef..813613a62f 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@@ -3,16 +3,24 @@ package io.onedev.server.util;import java.util.ArrayList;import java.util.List;+import javax.annotation.Nullable;+import io.onedev.server.web.util.WicketUtils;public interface EditContext {Object getInputValue(String name);+ @Nullablepublic static EditContext get(int level) {- return list().get(level);+ List<EditContext> list = list();+ if (list.size() > level)+ return list().get(level);+ else+ return null;}-++ @Nullablepublic static EditContext get() {return get(0);}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 c415fec425..edee66839e 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@@ -43,7 +43,9 @@ public class GroovyUtils {return logger;else if (variables.containsKey(name))return variables.get(name);- else+ else if (name.equals("editContext"))+ return EditContext.get();+ elsereturn super.getVariable(name);}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectAwareCommit.java b/server-core/src/main/java/io/onedev/server/util/ProjectAwareCommit.javanew file mode 100644index 0000000000..a15964387c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/ProjectAwareCommit.java@@ -0,0 +1,89 @@+package io.onedev.server.util;++import java.io.Serializable;+import java.util.Collection;+import java.util.Stack;++import javax.annotation.Nullable;++import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;++import io.onedev.server.model.Project;+import io.onedev.server.web.util.WicketUtils;++public class ProjectAwareCommit implements Serializable {++ private static final long serialVersionUID = 1L;++ private static ThreadLocal<Stack<ProjectAwareCommit>> stack = new ThreadLocal<Stack<ProjectAwareCommit>>() {++ @Override+ protected Stack<ProjectAwareCommit> initialValue() {+ return new Stack<>();+ }++ };++ private final Project project;++ private final ObjectId commitId;++ private transient Collection<Long> fixedIssueNumbers;++ public ProjectAwareCommit(Project project, ObjectId commitId) {+ this.project = project;+ this.commitId = commitId;+ }++ public Project getProject() {+ return project;+ }++ public ObjectId getCommitId() {+ return commitId;+ }++ public Collection<Long> getFixedIssueNumbers() {+ if (fixedIssueNumbers == null) {+ RevCommit revCommit = project.getRevCommit(commitId, true);+ fixedIssueNumbers = IssueUtils.parseFixedIssueNumbers(revCommit.getFullMessage());+ }+ return fixedIssueNumbers;+ }++ @Nullable+ public static ProjectAwareCommit from(String revisionFQN) {+ ProjectAwareRevision revision = ProjectAwareRevision.from(revisionFQN);+ if (revision != null) {+ Project project = revision.getProject();+ return new ProjectAwareCommit(project, project.getObjectId(revision.getRevision(), false));+ } else {+ return null;+ }+ }++ public static void push(ProjectAwareCommit commitId) {+ stack.get().push(commitId);+ }++ public static void pop() {+ stack.get().pop();+ }++ @Nullable+ public static ProjectAwareCommit get() {+ if (!stack.get().isEmpty()) {+ return stack.get().peek();+ } else {+ ComponentContext componentContext = ComponentContext.get();+ if (componentContext != null) {+ CommitAware commitAware = WicketUtils.findInnermost(componentContext.getComponent(), CommitAware.class);+ if (commitAware != null)+ return commitAware.getCommit();+ }+ return null;+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectAwareCommitId.java b/server-core/src/main/java/io/onedev/server/util/ProjectAwareCommitId.javadeleted file mode 100644index 13f8acf57a..0000000000--- a/server-core/src/main/java/io/onedev/server/util/ProjectAwareCommitId.java+++ /dev/null@@ -1,43 +0,0 @@-package io.onedev.server.util;--import java.io.Serializable;--import javax.annotation.Nullable;--import org.eclipse.jgit.lib.ObjectId;--import io.onedev.server.model.Project;--public class ProjectAwareCommitId implements Serializable {-- private static final long serialVersionUID = 1L;-- private final Project project;-- private final ObjectId commitId;-- public ProjectAwareCommitId(Project project, ObjectId commitId) {- this.project = project;- this.commitId = commitId;- }-- public Project getProject() {- return project;- }-- public ObjectId getCommitId() {- return commitId;- }-- @Nullable- public static ProjectAwareCommitId from(String revisionFQN) {- ProjectAwareRevision revision = ProjectAwareRevision.from(revisionFQN);- if (revision != null) {- Project project = revision.getProject();- return new ProjectAwareCommitId(project, project.getObjectId(revision.getRevision(), false));- } else {- return null;- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.javaindex 04c83f6422..5e0f32865a 100644--- a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java@@ -18,6 +18,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;+import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;@@ -140,7 +141,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}public static boolean canEditIssueField(Project project, String fieldName) {- return getSubject().isPermitted(new ProjectPermission(project, new EditIssueField(fieldName)));+ return getSubject().isPermitted(new ProjectPermission(project, new EditIssueField(Sets.newHashSet(fieldName))));}public static boolean canScheduleIssues(Project project) {diff --git a/server-core/src/main/java/io/onedev/server/util/ServerConfig.java b/server-core/src/main/java/io/onedev/server/util/ServerConfig.javaindex 8026bf5a42..dcd88148f3 100644--- a/server-core/src/main/java/io/onedev/server/util/ServerConfig.java+++ b/server-core/src/main/java/io/onedev/server/util/ServerConfig.java@@ -10,12 +10,16 @@ public interface ServerConfig {* Get http port configured for the server.* <p>* @return- * http port of the server, or <i>0</i> if http port is not defined.- * In case http port is not defined, {@link #getSslConfig()} must- * not return <tt>null</tt>+ * http port of the server, or <i>0</i> if http port is not defined*/int getHttpPort();+ /**+ * Get https port configured for the server.+ * <p>+ * @return+ * https port of the server, or <i>0</i> if https port is not defined+ */int getHttpsPort();@Nullablediff --git a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.javaindex 7e88cc03a3..f1715acebb 100644--- a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java+++ b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java@@ -1,23 +1,56 @@package io.onedev.server.util.criteria;import java.util.List;-import java.util.function.Predicate;+import java.util.stream.Collectors;-public class AndCriteria<T> implements Predicate<T> {+public class AndCriteria<T> extends Criteria<T> {- private final List<? extends Predicate<T>> predicates;+ private static final long serialVersionUID = 1L;++ protected final List<? extends Criteria<T>> criterias;- public AndCriteria(List<? extends Predicate<T>> predicates) {- this.predicates = predicates;+ public AndCriteria(List<? extends Criteria<T>> criterias) {+ this.criterias = criterias;+ }++ @Override+ public boolean matches(T t) {+ return criterias.stream().allMatch(it->it.matches(t));+ }++ @Override+ public void onRenameUser(String oldName, String newName) {+ criterias.stream().forEach(it->it.onRenameUser(oldName, newName));+ }++ @Override+ public void onRenameProject(String oldName, String newName) {+ criterias.stream().forEach(it->it.onRenameProject(oldName, newName));+ }++ @Override+ public void onRenameGroup(String oldName, String newName) {+ criterias.stream().forEach(it->it.onRenameGroup(oldName, newName));+ }++ @Override+ public boolean isUsingUser(String userName) {+ return criterias.stream().anyMatch(it->it.isUsingUser(userName));+ }++ @Override+ public boolean isUsingProject(String projectName) {+ return criterias.stream().anyMatch(it->it.isUsingProject(projectName));+ }++ @Override+ public boolean isUsingGroup(String groupName) {+ return criterias.stream().anyMatch(it->it.isUsingGroup(groupName));}@Override- public boolean test(T t) {- for (Predicate<T> predicate: predicates) {- if (!predicate.test(t))- return false;- }- return true;+ public String asString() {+ return criterias.stream().map(it->it.toString()).collect(Collectors.joining(" and "));}}diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.javanew file mode 100644index 0000000000..76d44600bd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java@@ -0,0 +1,55 @@+package io.onedev.server.util.criteria;++import java.io.Serializable;++import io.onedev.commons.utils.StringUtils;++public abstract class Criteria<T> implements Serializable {++ private static final long serialVersionUID = 1L;++ private boolean withParens;++ public abstract boolean matches(T t);++ public Criteria<T> withParens(boolean withParens) {+ this.withParens = withParens;+ return this;+ }++ public void onRenameUser(String oldName, String newName) {+ }++ public void onRenameProject(String oldName, String newName) {+ }++ public void onRenameGroup(String oldName, String newName) {+ }++ public boolean isUsingUser(String userName) {+ return false;+ }++ public boolean isUsingProject(String projectName) {+ return false;+ }++ public boolean isUsingGroup(String groupName) {+ return false;+ }++ public static String quote(String value) {+ return "\"" + StringUtils.escape(value, "\"") + "\"";+ }++ @Override+ public String toString() {+ if (withParens)+ return "(" + asString() + ")";+ else+ return asString();+ }++ public abstract String asString();++}diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.javaindex cab02f688a..8670efd184 100644--- a/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java+++ b/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java@@ -1,18 +1,53 @@package io.onedev.server.util.criteria;-import java.util.function.Predicate;--public class NotCriteria<T> implements Predicate<T> {+public class NotCriteria<T> extends Criteria<T> {- private final Predicate<T> predicate;+ private static final long serialVersionUID = 1L;++ protected final Criteria<T> criteria;- public NotCriteria(Predicate<T> predicate) {- this.predicate = predicate;+ public NotCriteria(Criteria<T> criteria) {+ this.criteria = criteria;+ }++ @Override+ public boolean matches(T entity) {+ return !criteria.matches(entity);+ }++ @Override+ public void onRenameUser(String oldName, String newName) {+ criteria.onRenameUser(oldName, newName);+ }++ @Override+ public void onRenameProject(String oldName, String newName) {+ criteria.onRenameProject(oldName, newName);}@Override- public boolean test(T t) {- return !predicate.test(t);+ public void onRenameGroup(String oldName, String newName) {+ criteria.onRenameGroup(oldName, newName);}+ @Override+ public boolean isUsingUser(String userName) {+ return criteria.isUsingUser(userName);+ }++ @Override+ public boolean isUsingProject(String projectName) {+ return criteria.isUsingProject(projectName);+ }++ @Override+ public boolean isUsingGroup(String groupName) {+ return criteria.isUsingGroup(groupName);+ }++ @Override+ public String asString() {+ return "not(" + criteria.toString() + ")";+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.javaindex 35389bc333..d6a165b758 100644--- a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java+++ b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java@@ -1,23 +1,56 @@package io.onedev.server.util.criteria;import java.util.List;-import java.util.function.Predicate;+import java.util.stream.Collectors;-public class OrCriteria<T> implements Predicate<T> {+public class OrCriteria<T> extends Criteria<T> {- private final List<? extends Predicate<T>> predicates;+ private static final long serialVersionUID = 1L;++ protected final List<? extends Criteria<T>> criterias;- public OrCriteria(List<? extends Predicate<T>> predicates) {- this.predicates = predicates;+ public OrCriteria(List<? extends Criteria<T>> criterias) {+ this.criterias = criterias;+ }++ @Override+ public boolean matches(T t) {+ return criterias.stream().anyMatch(it->it.matches(t));+ }++ @Override+ public void onRenameUser(String oldName, String newName) {+ criterias.stream().forEach(it->it.onRenameUser(oldName, newName));+ }++ @Override+ public void onRenameProject(String oldName, String newName) {+ criterias.stream().forEach(it->it.onRenameProject(oldName, newName));+ }++ @Override+ public void onRenameGroup(String oldName, String newName) {+ criterias.stream().forEach(it->it.onRenameGroup(oldName, newName));+ }++ @Override+ public boolean isUsingUser(String userName) {+ return criterias.stream().anyMatch(it->it.isUsingUser(userName));}@Override- public boolean test(T t) {- for (Predicate<T> predicate: predicates) {- if (predicate.test(t))- return true;- }- return false;+ public boolean isUsingProject(String projectName) {+ return criterias.stream().anyMatch(it->it.isUsingProject(projectName));}+ @Override+ public boolean isUsingGroup(String groupName) {+ return criterias.stream().anyMatch(it->it.isUsingGroup(groupName));+ }++ @Override+ public String asString() {+ return criterias.stream().map(it->it.toString()).collect(Collectors.joining(" or "));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/CommitInput.javaindex dd8234b007..b181737e12 100755--- a/server-core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java@@ -17,6 +17,7 @@ public class CommitInput {StringBuffer buffer = new StringBuffer();inputSpec.appendField(buffer, index, "String");inputSpec.appendCommonAnnotations(buffer, index);+ buffer.append(" @CommitHash\n");if (!inputSpec.isAllowEmpty())buffer.append(" @NotEmpty\n");inputSpec.appendMethods(buffer, index, "String", null, null);diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex e63e5b5a2c..feae0ab328 100644--- a/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -227,6 +227,7 @@ public abstract class InputSpec implements Serializable {buffer.append("import org.apache.commons.lang3.SerializationUtils;\n");buffer.append("import com.google.common.base.Optional;\n");buffer.append("import io.onedev.server.web.editable.annotation.*;\n");+ buffer.append("import io.onedev.server.util.validation.annotation.*;\n");buffer.append("import io.onedev.util.*;\n");buffer.append("import io.onedev.server.util.*;\n");buffer.append("import io.onedev.server.util.facade.*;\n");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/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 8225838f3e..d208604de1 100755--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -29,7 +29,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {@Overridepublic String getDefaultValue() {- return (String) GroovyUtils.evalScript(scriptName);+ return (String) GroovyUtils.evalScriptByName(scriptName);}}diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/AlwaysCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/AlwaysCriteria.javanew file mode 100644index 0000000000..a85c0134bb--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/AlwaysCriteria.java@@ -0,0 +1,23 @@+package io.onedev.server.util.jobmatch;++import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;+import static io.onedev.server.util.jobmatch.JobMatchLexer.All;++import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class AlwaysCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ @Override+ public boolean matches(Build build) {+ return true;+ }++ @Override+ public String asString() {+ return getRuleName(All);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/BranchCriteria.javanew file mode 100644index 0000000000..5c87f3c2f2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/BranchCriteria.java@@ -0,0 +1,28 @@+package io.onedev.server.util.jobmatch;++import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;+import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;+import static io.onedev.server.util.jobmatch.JobMatchLexer.OnBranch;++public class BranchCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private final String branch;++ public BranchCriteria(String branch) {+ this.branch = branch;+ }++ @Override+ public boolean matches(Build build) {+ return build.getProject().isCommitOnBranches(build.getCommitId(), branch);+ }++ @Override+ public String asString() {+ return getRuleName(OnBranch) + " " + quote(branch);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/ImageCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/ImageCriteria.javanew file mode 100644index 0000000000..0b561eb7fd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/ImageCriteria.java@@ -0,0 +1,31 @@+package io.onedev.server.util.jobmatch;++import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;+import static io.onedev.server.util.jobmatch.JobMatchLexer.Is;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_IMAGE;++import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.match.WildcardUtils;++public class ImageCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private String image;++ public ImageCriteria(String image) {+ this.image = image;+ }++ @Override+ public boolean matches(Build build) {+ return WildcardUtils.matchString(image, build.getJob().getImage());+ }++ @Override+ public String asString() {+ return quote(FIELD_IMAGE) + " " + getRuleName(Is) + " " + quote(image);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.g4 b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.g4new file mode 100644index 0000000000..2067ec4475--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.g4@@ -0,0 +1,58 @@+grammar JobMatch;++jobMatch+ : WS* (criteria|All) WS* EOF+ ;++criteria+ : operator=OnBranch WS+ criteriaValue=Quoted #OperatorValueCriteria+ | criteriaField=Quoted WS+ operator=Is WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | criteria WS+ And WS+ criteria #AndCriteria+ | criteria WS+ Or WS+ criteria #OrCriteria+ | Not WS* LParens WS* criteria WS* RParens #NotCriteria+ | LParens WS* criteria WS* RParens #ParensCriteria+ ;++All+ : 'all'+ ;++OnBranch+ : 'on' WS+ 'branch'+ ;++Is+ : 'is'+ ;++And+ : 'and'+ ;++Or+ : 'or'+ ;++Not+ : 'not'+ ;++LParens+ : '('+ ;++RParens+ : ')'+ ;++Quoted+ : '"' ('\\'.|~[\\"])+? '"'+ ;++WS+ : ' '+ ;++Identifier+ : [a-zA-Z0-9:_/\\+\-;]++ ;diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.javanew file mode 100644index 0000000000..aebe1672d0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java@@ -0,0 +1,188 @@+package io.onedev.server.util.jobmatch;++import java.util.ArrayList;+import java.util.List;++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 io.onedev.commons.codeassist.AntlrUtils;+import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneException;+import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.AndCriteria;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.criteria.NotCriteria;+import io.onedev.server.util.criteria.OrCriteria;+import io.onedev.server.util.jobmatch.JobMatchParser.AndCriteriaContext;+import io.onedev.server.util.jobmatch.JobMatchParser.CriteriaContext;+import io.onedev.server.util.jobmatch.JobMatchParser.FieldOperatorValueCriteriaContext;+import io.onedev.server.util.jobmatch.JobMatchParser.JobMatchContext;+import io.onedev.server.util.jobmatch.JobMatchParser.NotCriteriaContext;+import io.onedev.server.util.jobmatch.JobMatchParser.OperatorValueCriteriaContext;+import io.onedev.server.util.jobmatch.JobMatchParser.OrCriteriaContext;+import io.onedev.server.util.jobmatch.JobMatchParser.ParensCriteriaContext;+import io.onedev.server.util.query.BuildQueryConstants;++public class JobMatch extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private final Criteria<Build> criteria;++ public JobMatch(Criteria<Build> criteria) {+ this.criteria = criteria;+ }++ public static String getValue(String token) {+ return StringUtils.unescape(FenceAware.unfence(token));+ }++ public static JobMatch parse(String jobMatchString) {+ CharStream is = CharStreams.fromString(jobMatchString);+ JobMatchLexer lexer = new JobMatchLexer(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 job match", e);+ }++ });+ CommonTokenStream tokens = new CommonTokenStream(lexer);+ JobMatchParser parser = new JobMatchParser(tokens);+ parser.removeErrorListeners();+ parser.setErrorHandler(new BailErrorStrategy());+ JobMatchContext jobMatchContext;+ try {+ jobMatchContext = parser.jobMatch();+ } catch (Exception e) {+ if (e instanceof OneException)+ throw e;+ else+ throw new OneException("Malformed job match", e);+ }++ Criteria<Build> criteria;++ if (jobMatchContext.All() != null) {+ criteria = new AlwaysCriteria();+ } else {+ criteria = new JobMatchBaseVisitor<Criteria<Build>>() {++ @Override+ public Criteria<Build> visitParensCriteria(ParensCriteriaContext ctx) {+ return visit(ctx.criteria()).withParens(true);+ }++ @Override+ public Criteria<Build> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {+ String fieldName = getValue(ctx.Quoted(0).getText());+ String fieldValue = getValue(ctx.Quoted(1).getText());+ int operator = ctx.operator.getType();+ checkField(fieldName, operator);++ switch (fieldName) {+ case BuildQueryConstants.FIELD_PROJECT:+ return new ProjectCriteria(fieldValue);+ case BuildQueryConstants.FIELD_PROJECT_OWNER:+ return new ProjectOwnerCriteria(fieldValue);+ case BuildQueryConstants.FIELD_JOB:+ return new NameCriteria(fieldValue);+ default:+ return new ImageCriteria(fieldValue);+ }+ }++ @Override+ public Criteria<Build> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {+ String fieldValue = getValue(ctx.Quoted().getText());+ return new BranchCriteria(fieldValue);+ }++ @Override+ public Criteria<Build> visitOrCriteria(OrCriteriaContext ctx) {+ List<Criteria<Build>> childCriterias = new ArrayList<>();+ for (CriteriaContext childCtx: ctx.criteria())+ childCriterias.add(visit(childCtx));+ return new OrCriteria<Build>(childCriterias);+ }++ @Override+ public Criteria<Build> visitAndCriteria(AndCriteriaContext ctx) {+ List<Criteria<Build>> childCriterias = new ArrayList<>();+ for (CriteriaContext childCtx: ctx.criteria())+ childCriterias.add(visit(childCtx));+ return new AndCriteria<Build>(childCriterias);+ }++ @Override+ public Criteria<Build> visitNotCriteria(NotCriteriaContext ctx) {+ return new NotCriteria<Build>(visit(ctx.criteria()));+ }++ }.visit(jobMatchContext.criteria());+ }+ return new JobMatch(criteria);+ }++ public static void checkField(String fieldName, int operator) {+ if (fieldName.equals(BuildQueryConstants.FIELD_PROJECT)+ || fieldName.equals(BuildQueryConstants.FIELD_PROJECT_OWNER)+ || fieldName.equals(BuildQueryConstants.FIELD_JOB)+ || fieldName.equals(BuildQueryConstants.FIELD_IMAGE)) {+ if (operator != JobMatchLexer.Is)+ throw newOperatorException(fieldName, operator);+ } else {+ throw new OneException("Invalid field: " + fieldName);+ }+ }++ private static OneException newOperatorException(String fieldName, int operator) {+ return new OneException("Field '" + fieldName + "' is not applicable for operator '"+ + AntlrUtils.getLexerRuleName(JobMatchLexer.ruleNames, operator) + "'");+ }++ @Override+ public boolean matches(Build build) {+ return criteria.matches(build);+ }++ @Override+ public void onRenameUser(String oldName, String newName) {+ criteria.onRenameUser(oldName, newName);+ }++ @Override+ public void onRenameProject(String oldName, String newName) {+ criteria.onRenameProject(oldName, newName);+ }++ @Override+ public boolean isUsingUser(String userName) {+ return criteria.isUsingUser(userName);+ }++ @Override+ public boolean isUsingProject(String projectName) {+ return criteria.isUsingProject(projectName);+ }++ public static String getRuleName(int rule) {+ return AntlrUtils.getLexerRuleName(JobMatchLexer.ruleNames, rule);+ }++ @Override+ public String asString() {+ return criteria.toString();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/NameCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/NameCriteria.javanew file mode 100644index 0000000000..d978e86c5f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/NameCriteria.java@@ -0,0 +1,32 @@+package io.onedev.server.util.jobmatch;++import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;+import static io.onedev.server.util.jobmatch.JobMatchLexer.Is;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_JOB;++import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.match.WildcardUtils;+++public class NameCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private String jobName;++ public NameCriteria(String jobName) {+ this.jobName = jobName;+ }++ @Override+ public boolean matches(Build build) {+ return WildcardUtils.matchString(jobName, build.getJobName());+ }++ @Override+ public String asString() {+ return quote(FIELD_JOB) + " " + getRuleName(Is) + " " + quote(jobName);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectCriteria.javanew file mode 100644index 0000000000..d73f40cf2c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectCriteria.java@@ -0,0 +1,42 @@+package io.onedev.server.util.jobmatch;++import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;+import static io.onedev.server.util.jobmatch.JobMatchLexer.Is;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_PROJECT;++import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.match.WildcardUtils;++public class ProjectCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private String projectName;++ public ProjectCriteria(String projectName) {+ this.projectName = projectName;+ }++ @Override+ public boolean matches(Build build) {+ return WildcardUtils.matchString(projectName, build.getProject().getName());+ }++ @Override+ public void onRenameProject(String oldName, String newName) {+ if (oldName.equals(projectName))+ projectName = newName;+ }++ @Override+ public boolean isUsingProject(String projectName) {+ return projectName.equals(this.projectName);+ }++ @Override+ public String asString() {+ return quote(FIELD_PROJECT) + " " + getRuleName(Is) + " " + quote(projectName);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectOwnerCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectOwnerCriteria.javanew file mode 100644index 0000000000..70a54d52ce--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectOwnerCriteria.java@@ -0,0 +1,42 @@+package io.onedev.server.util.jobmatch;++import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;+import static io.onedev.server.util.jobmatch.JobMatchLexer.Is;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_PROJECT_OWNER;++import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.match.WildcardUtils;++public class ProjectOwnerCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private String ownerName;++ public ProjectOwnerCriteria(String ownerName) {+ this.ownerName = ownerName;+ }++ @Override+ public boolean matches(Build build) {+ return WildcardUtils.matchString(ownerName, build.getProject().getOwner().getName());+ }++ @Override+ public void onRenameUser(String oldName, String newName) {+ if (oldName.equals(ownerName))+ ownerName = newName;+ }++ @Override+ public boolean isUsingUser(String userName) {+ return userName.equals(ownerName);+ }++ @Override+ public String asString() {+ return quote(FIELD_PROJECT_OWNER) + " " + getRuleName(Is) + " " + quote(ownerName);+ }++}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 95a12911f3..abacbce21e 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@@ -76,12 +76,28 @@ public class PatternSet implements Serializable {return files;}- public static PatternSet fromString(@Nullable String patternSetString) {+ public static PatternSet parse(@Nullable String patternSetString) {Set<String> includes = new HashSet<>();Set<String> excludes = new HashSet<>();if (patternSetString != null) {- PatternsContext patterns = parse(patternSetString);+ CharStream is = CharStreams.fromString(patternSetString);+ PatternSetLexer lexer = new PatternSetLexer(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 patterns");+ }++ });+ CommonTokenStream tokens = new CommonTokenStream(lexer);+ PatternSetParser parser = new PatternSetParser(tokens);+ parser.removeErrorListeners();+ parser.setErrorHandler(new BailErrorStrategy());+ PatternsContext patterns = parser.patterns();for (PatternContext pattern: patterns.pattern()) {String value;@@ -100,26 +116,6 @@ public class PatternSet implements Serializable {return new PatternSet(includes, excludes);}- public static PatternsContext parse(String patternSetString) {- CharStream is = CharStreams.fromString(patternSetString);- PatternSetLexer lexer = new PatternSetLexer(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 patterns");- }-- });- CommonTokenStream tokens = new CommonTokenStream(lexer);- PatternSetParser parser = new PatternSetParser(tokens);- parser.removeErrorListeners();- parser.setErrorHandler(new BailErrorStrategy());- return parser.patterns();- }-public static String quoteIfNecessary(String pattern) {pattern = StringUtils.escape(pattern, "\"");if (pattern.indexOf(" ") != -1 || pattern.startsWith("-"))diff --git a/server-core/src/main/java/io/onedev/server/util/query/BuildQueryConstants.java b/server-core/src/main/java/io/onedev/server/util/query/BuildQueryConstants.javaindex 8f4f2eb035..d87006569f 100644--- a/server-core/src/main/java/io/onedev/server/util/query/BuildQueryConstants.java+++ b/server-core/src/main/java/io/onedev/server/util/query/BuildQueryConstants.java@@ -25,10 +25,14 @@ public class BuildQueryConstants {public static final String ATTR_PROJECT = "project";+ public static final String FIELD_PROJECT_OWNER = "Project Owner";+public static final String FIELD_JOB = "Job";public static final String ATTR_JOB = "jobName";+ public static final String FIELD_IMAGE = "Image";+public static final String FIELD_STATUS = "Status";public static final String ATTR_STATUS = "status";@@ -83,7 +87,7 @@ public class BuildQueryConstants {FIELD_PROJECT, FIELD_NUMBER, FIELD_JOB, FIELD_STATUS, FIELD_SUBMITTER, FIELD_CANCELLER,FIELD_SUBMIT_DATE, FIELD_QUEUEING_DATE, FIELD_RUNNING_DATE, FIELD_FINISH_DATE,FIELD_COMMIT, FIELD_VERSION, FIELD_DEPENDENCIES, FIELD_DEPENDENTS, FIELD_ERROR_MESSAGE,- FIELD_LOG);+ FIELD_LOG, FIELD_PROJECT_OWNER, FIELD_IMAGE);public static final List<String> QUERY_FIELDS = Lists.newArrayList(FIELD_PROJECT, FIELD_JOB, FIELD_NUMBER, FIELD_VERSION, FIELD_COMMIT, FIELD_SUBMIT_DATE,diff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.javaindex 2f0db24602..44bd291ed0 100644--- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java+++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java@@ -39,12 +39,28 @@ public class ReviewRequirement {this.groups = groups;}- public static ReviewRequirement fromString(@Nullable String requirementString) {+ public static ReviewRequirement parse(@Nullable String requirementString, boolean validate) {List<User> users = new ArrayList<>();Map<Group, Integer> groups = new LinkedHashMap<>();if (requirementString != null) {- RequirementContext requirement = parse(requirementString);+ CharStream is = CharStreams.fromString(requirementString);+ ReviewRequirementLexer lexer = new ReviewRequirementLexer(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 review requirement");+ }++ });+ CommonTokenStream tokens = new CommonTokenStream(lexer);+ ReviewRequirementParser parser = new ReviewRequirementParser(tokens);+ parser.removeErrorListeners();+ parser.setErrorHandler(new BailErrorStrategy());+ RequirementContext requirement = parser.requirement();for (CriteriaContext criteria: requirement.criteria()) {if (criteria.userCriteria() != null) {@@ -53,9 +69,9 @@ public class ReviewRequirement {if (user != null) {if (!users.contains(user))users.add(user);- else+ else if (validate)throw new OneException("User '" + userName + "' is included multiple times");- } else {+ } else if (validate) {throw new OneException("Unable to find user '" + userName + "'");}} else if (criteria.groupCriteria() != null) {@@ -72,10 +88,10 @@ public class ReviewRequirement {} else {groups.put(group, 1);}- } else {+ } else if (validate) {throw new OneException("Group '" + groupName + "' is included multiple times");}- } else {+ } else if (validate) {throw new OneException("Unable to find group '" + groupName + "'");}}@@ -85,26 +101,6 @@ public class ReviewRequirement {return new ReviewRequirement(users, groups);}- public static RequirementContext parse(String requirementString) {- CharStream is = CharStreams.fromString(requirementString);- ReviewRequirementLexer lexer = new ReviewRequirementLexer(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 review requirement");- }-- });- CommonTokenStream tokens = new CommonTokenStream(lexer);- ReviewRequirementParser parser = new ReviewRequirementParser(tokens);- parser.removeErrorListeners();- parser.setErrorHandler(new BailErrorStrategy());- return parser.requirement();- }-private static String getValue(TerminalNode terminal) {return StringUtils.unescape(FenceAware.unfence(terminal.getText()));}@@ -136,7 +132,7 @@ public class ReviewRequirement {@Nullablepublic static String onRenameGroup(@Nullable String reviewRequirementString, String oldName, String newName) {- ReviewRequirement reviewRequirement = fromString(reviewRequirementString);+ ReviewRequirement reviewRequirement = parse(reviewRequirementString, false);for (Group group: reviewRequirement.getGroups().keySet()) {if (group.getName().equals(oldName))group.setName(newName);@@ -145,7 +141,7 @@ public class ReviewRequirement {}public static String onRenameUser(@Nullable String reviewRequirementString, String oldName, String newName) {- ReviewRequirement reviewRequirement = fromString(reviewRequirementString);+ ReviewRequirement reviewRequirement = parse(reviewRequirementString, false);for (User user: reviewRequirement.getUsers()) {if (user.getName().equals(oldName))user.setName(newName);@@ -154,7 +150,7 @@ public class ReviewRequirement {}public static boolean isUsingUser(@Nullable String reviewRequirementString, String userName) {- ReviewRequirement reviewRequirement = fromString(reviewRequirementString);+ ReviewRequirement reviewRequirement = parse(reviewRequirementString, false);for (User user: reviewRequirement.getUsers()) {if (user.getName().equals(userName))return true;@@ -163,7 +159,7 @@ public class ReviewRequirement {}public static boolean isUsingGroup(@Nullable String reviewRequirementString, String groupName) {- ReviewRequirement reviewRequirement = fromString(reviewRequirementString);+ ReviewRequirement reviewRequirement = parse(reviewRequirementString, false);for (Group group: reviewRequirement.getGroups().keySet()) {if (group.getName().equals(groupName))return true;diff --git a/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.javaindex 783889640e..e7d18cb8dd 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java@@ -60,7 +60,7 @@ public class UserMatch implements Serializable {return false;}- private static UserMatchCriteria getUserMatcherCriteria(CriteriaContext criteriaContext) {+ private static UserMatchCriteria getUserMatchCriteria(CriteriaContext criteriaContext) {if (criteriaContext.Anyone() != null) {return new Anyone();} else if (criteriaContext.userCriteria() != null) {@@ -74,22 +74,22 @@ public class UserMatch implements Serializable {specifiedGroup.setGroupName(groupName);return specifiedGroup;} else {- throw new OneException("Unrecognized user matcher criteria");+ throw new OneException("Unrecognized user match criteria");}}- public static UserMatch fromString(@Nullable String userMatcherString) {+ public static UserMatch fromString(@Nullable String userMatchString) {List<UserMatchCriteria> criterias = new ArrayList<>();List<UserMatchCriteria> exceptCriterias = new ArrayList<>();- if (userMatcherString != null) {- UserMatchContext userMatcherContext = parse(userMatcherString);+ if (userMatchString != null) {+ UserMatchContext userMatchContext = parse(userMatchString);- for (CriteriaContext criteriaContext: userMatcherContext.criteria())- criterias.add(getUserMatcherCriteria(criteriaContext));+ for (CriteriaContext criteriaContext: userMatchContext.criteria())+ criterias.add(getUserMatchCriteria(criteriaContext));- for (ExceptCriteriaContext exceptCriteriaContext: userMatcherContext.exceptCriteria()) {- exceptCriterias.add(getUserMatcherCriteria(exceptCriteriaContext.criteria()));+ for (ExceptCriteriaContext exceptCriteriaContext: userMatchContext.exceptCriteria()) {+ exceptCriterias.add(getUserMatchCriteria(exceptCriteriaContext.criteria()));}}@@ -100,8 +100,8 @@ public class UserMatch implements Serializable {return StringUtils.unescape(FenceAware.unfence(terminal.getText()));}- public static UserMatchContext parse(String userMatcherString) {- CharStream is = CharStreams.fromString(userMatcherString);+ public static UserMatchContext parse(String userMatchString) {+ CharStream is = CharStreams.fromString(userMatchString);UserMatchLexer lexer = new UserMatchLexer(is);lexer.removeErrorListeners();lexer.addErrorListener(new BaseErrorListener() {@@ -109,7 +109,7 @@ public class UserMatch implements Serializable {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {- throw new OneException("Malformed user matcher");+ throw new OneException("Malformed user match");}});@@ -149,11 +149,11 @@ public class UserMatch implements Serializable {}}- public static String onRenameGroup(String userMatcherString, String oldName, String newName) {- UserMatch userMatcher = fromString(userMatcherString);- onRenameGroup(userMatcher.getCriterias(), oldName, newName);- onRenameGroup(userMatcher.getExceptCriterias(), oldName, newName);- return userMatcher.toString();+ public static String onRenameGroup(String userMatchString, String oldName, String newName) {+ UserMatch userMatch = fromString(userMatchString);+ onRenameGroup(userMatch.getCriterias(), oldName, newName);+ onRenameGroup(userMatch.getExceptCriterias(), oldName, newName);+ return userMatch.toString();}private static void onRenameUser(List<UserMatchCriteria> criterias, String oldName, String newName) {@@ -166,11 +166,11 @@ public class UserMatch implements Serializable {}}- public static String onRenameUser(String userMatcherString, String oldName, String newName) {- UserMatch userMatcher = fromString(userMatcherString);- onRenameUser(userMatcher.getCriterias(), oldName, newName);- onRenameUser(userMatcher.getExceptCriterias(), oldName, newName);- return userMatcher.toString();+ public static String onRenameUser(String userMatchString, String oldName, String newName) {+ UserMatch userMatch = fromString(userMatchString);+ onRenameUser(userMatch.getCriterias(), oldName, newName);+ onRenameUser(userMatch.getExceptCriterias(), oldName, newName);+ return userMatch.toString();}private static boolean isUsingUser(List<UserMatchCriteria> criterias, String userName) {@@ -184,10 +184,10 @@ public class UserMatch implements Serializable {return false;}- public static boolean isUsingUser(String userMatcherString, String userName) {- UserMatch userMatcher = fromString(userMatcherString);- return isUsingUser(userMatcher.getCriterias(), userName)- || isUsingUser(userMatcher.getExceptCriterias(), userName);+ public static boolean isUsingUser(String userMatchString, String userName) {+ UserMatch userMatch = fromString(userMatchString);+ return isUsingUser(userMatch.getCriterias(), userName)+ || isUsingUser(userMatch.getExceptCriterias(), userName);}private static boolean isUsingGroup(List<UserMatchCriteria> criterias, String groupName) {@@ -201,10 +201,10 @@ public class UserMatch implements Serializable {return false;}- public static boolean isUsingGroup(String userMatcherString, String groupName) {- UserMatch userMatcher = fromString(userMatcherString);- return isUsingGroup(userMatcher.getCriterias(), groupName)- || isUsingGroup(userMatcher.getExceptCriterias(), groupName);+ public static boolean isUsingGroup(String userMatchString, String groupName) {+ UserMatch userMatch = fromString(userMatchString);+ return isUsingGroup(userMatch.getCriterias(), groupName)+ || isUsingGroup(userMatch.getExceptCriterias(), groupName);}}diff --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 fc46235532..4e0b8f17b1 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@@ -15,9 +15,17 @@ public class IssueQueryValidator implements ConstraintValidator<IssueQuery, Striprivate boolean withCurrentBuildCriteria;+ private boolean withCurrentPullRequestCriteria;++ private boolean withCurrentCommitCriteria;+@Overridepublic void initialize(IssueQuery constaintAnnotation) {message = constaintAnnotation.message();+ withCurrentUserCriteria = constaintAnnotation.withCurrentUserCriteria();+ withCurrentBuildCriteria = constaintAnnotation.withCurrentBuildCriteria();+ withCurrentPullRequestCriteria = constaintAnnotation.withCurrentPullRequestCriteria();+ withCurrentCommitCriteria = constaintAnnotation.withCurrentCommitCriteria();}@Override@@ -28,7 +36,8 @@ public class IssueQueryValidator implements ConstraintValidator<IssueQuery, StriProject project = Project.get();try {io.onedev.server.search.entity.issue.IssueQuery.parse(project, value,- true, withCurrentUserCriteria, withCurrentBuildCriteria);+ true, withCurrentUserCriteria, withCurrentBuildCriteria,+ withCurrentPullRequestCriteria, withCurrentCommitCriteria);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.javanew file mode 100644index 0000000000..68eb83cceb--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.java@@ -0,0 +1,42 @@+package io.onedev.server.util.validation;++import javax.validation.ConstraintValidator;+import javax.validation.ConstraintValidatorContext;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.web.editable.annotation.JobMatch;++public class JobMatchValidator implements ConstraintValidator<JobMatch, String> {++ private String message;++ @Override+ public void initialize(JobMatch constaintAnnotation) {+ message = constaintAnnotation.message();+ }++ @Override+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {+ if (value == null) {+ return true;+ } else {+ try {+ io.onedev.server.util.jobmatch.JobMatch.parse(value);+ return true;+ } catch (Exception e) {+ constraintContext.disableDefaultConstraintViolation();+ String message = this.message;+ if (message.length() == 0) {+ if (StringUtils.isNotBlank(e.getMessage()))+ message = e.getMessage();+ else+ message = "Malformed job match";+ }++ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ }+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/NotificationReceiverValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/NotificationReceiverValidator.javaindex b9cc8dedb0..a344b1a906 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/NotificationReceiverValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/NotificationReceiverValidator.java@@ -22,7 +22,7 @@ public class NotificationReceiverValidator implements ConstraintValidator<Notifireturn true;} else {try {- io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiver.fromString(value, null);+ io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiver.parse(value, null);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.javaindex 5b8dca0452..90553c89fb 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java@@ -1,6 +1,5 @@package io.onedev.server.util.validation;-import javax.lang.model.SourceVersion;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;@@ -22,15 +21,7 @@ public class ParamNameValidator implements ConstraintValidator<ParamName, Stringreturn 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 (BuildQueryConstants.ALL_FIELDS.contains(value)) {+ if (BuildQueryConstants.ALL_FIELDS.contains(value)) {constraintContext.disableDefaultConstraintViolation();if (message.length() == 0)message = "'" + value + "' is reserved";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 5571b36440..060ffadcc1 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@@ -38,7 +38,7 @@ public class PatternsValidator implements ConstraintValidator<Patterns, String>return true; // will be handled by interpolative validator}try {- PatternSet.fromString(value);+ PatternSet.parse(value);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();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 514a5e2ee6..5a1c1fe364 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@@ -22,7 +22,7 @@ public class ReviewRequirementValidator implements ConstraintValidator<ReviewReqreturn true;} else {try {- io.onedev.server.util.reviewrequirement.ReviewRequirement.fromString(value);+ io.onedev.server.util.reviewrequirement.ReviewRequirement.parse(value, true);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();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/UserMatchValidator.javasimilarity index 75%rename from server-core/src/main/java/io/onedev/server/util/validation/UserMatcherValidator.javarename to server-core/src/main/java/io/onedev/server/util/validation/UserMatchValidator.javaindex 42a162ec4a..b5845028d5 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/UserMatchValidator.java@@ -4,14 +4,14 @@ import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.web.editable.annotation.UserMatcher;+import io.onedev.server.web.editable.annotation.UserMatch;-public class UserMatcherValidator implements ConstraintValidator<UserMatcher, String> {+public class UserMatchValidator implements ConstraintValidator<UserMatch, String> {private String message;@Override- public void initialize(UserMatcher constaintAnnotation) {+ public void initialize(UserMatch constaintAnnotation) {message = constaintAnnotation.message();}@@ -30,7 +30,7 @@ public class UserMatcherValidator implements ConstraintValidator<UserMatcher, Stif (StringUtils.isNotBlank(e.getMessage()))message = e.getMessage();else- message = "Malformed user matcher";+ message = "Malformed user match";}constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java b/server-core/src/main/java/io/onedev/server/web/OneWebApplication.javaindex d0de6f3736..e8adbb4991 100644--- a/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java+++ b/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java@@ -130,7 +130,8 @@ public class OneWebApplication extends WebApplication {target.add(page.getSessionFeedback());for (Component component: map.values()) {- target.appendJavaScript((String.format("$(document).trigger('elementReplaced', '%s');", component.getMarkupId())));+ target.prependJavaScript((String.format("$(document).trigger('beforeElementReplace', '%s');", component.getMarkupId())));+ target.appendJavaScript((String.format("$(document).trigger('afterElementReplace', '%s');", component.getMarkupId())));}}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 82dbae22b1..2987f250c0 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@@ -27,7 +27,6 @@ public class CodeMirrorResourceReference extends BaseDependentResourceReferenceList<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/lib/codemirror.js")));dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/mode/overlay.js")));- dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/mode/loadmode.js")));dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/edit/matchbrackets.js")));dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/dialog/dialog.js")));dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/fold/foldcode.js")));@@ -50,6 +49,7 @@ public class CodeMirrorResourceReference extends BaseDependentResourceReferencedependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "gotoline.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "identifier-highlighter.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "highlight.js")));+ dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "loadmode.js")));dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/mode/meta.js")));dependencies.add(JavaScriptHeaderItem.forReference(new ModeUrlResourceReference()));diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.jsindex c7a902efa6..c148ed42f7 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.js@@ -172,4 +172,16 @@ onedev.server.codemirror = {$(document).bind("keydown", "down", goLineDown);}}-};\ No newline at end of file+};++$(document).on("beforeElementReplace", function(event, componentId) {+ var $component = $("#" + componentId);+ $component.find(".CodeMirror").each(function() {+ var cm = this.CodeMirror;+ if (cm.toTextArea)+ cm.toTextArea();+ }).remove();+ $component.find("form").addBack("form").each(function() {+ this.submit = undefined;+ });+});diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/loadmode.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/loadmode.jsnew file mode 100644index 0000000000..ca46844b44--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/loadmode.js@@ -0,0 +1,65 @@+// CodeMirror, copyright (c) by Marijn Haverbeke and others+// Distributed under an MIT license: http://codemirror.net/LICENSE++(function(mod) {+ if (typeof exports == "object" && typeof module == "object") // CommonJS+ mod(require("../../lib/codemirror"), "cjs");+ else if (typeof define == "function" && define.amd) // AMD+ define(["../../lib/codemirror"], function(CM) { mod(CM, "amd"); });+ else // Plain browser env+ mod(CodeMirror, "plain");+})(function(CodeMirror, env) {+ if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";++ var loading = {};+ function splitCallback(cont, n) {+ var countDown = n;+ return function() { if (--countDown == 0) cont(); };+ }+ function ensureDeps(mode, cont) {+ var deps = CodeMirror.modes[mode].dependencies;+ if (!deps) return cont();+ var missing = [];+ for (var i = 0; i < deps.length; ++i) {+ if (!CodeMirror.modes.hasOwnProperty(deps[i]))+ missing.push(deps[i]);+ }+ if (!missing.length) return cont();+ var split = splitCallback(cont, missing.length);+ for (var i = 0; i < missing.length; ++i)+ CodeMirror.requireMode(missing[i], split);+ }++ CodeMirror.requireMode = function(mode, cont) {+ if (typeof mode != "string") mode = mode.name;+ if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont);+ if (loading.hasOwnProperty(mode)) return loading[mode].push(cont);++ var file = CodeMirror.modeURL.replace(/%N/g, mode);+ if (env == "plain") {+ var script = document.createElement("script");+ script.src = file;+ var others = document.getElementsByTagName("script")[0];+ var list = loading[mode] = [cont];+ CodeMirror.on(script, "load", function() {+ ensureDeps(mode, function() {+ for (var i = 0; i < list.length; ++i) list[i]();+ });+ });+ others.parentNode.insertBefore(script, others);+ } else if (env == "cjs") {+ require(file);+ cont();+ } else if (env == "amd") {+ requirejs([file], cont);+ }+ };++ CodeMirror.autoLoadMode = function(instance, mode) {+ if (!CodeMirror.modes.hasOwnProperty(mode))+ CodeMirror.requireMode(mode, function() {+ instance.setOption("mode", instance.getOption("mode"));+ instance = null;+ });+ };+});diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.javaindex 7de9dafb83..f3ce5b8cc3 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java@@ -61,7 +61,7 @@ public class ActionConditionBehavior extends ANTLRAssistBehavior {int operator = AntlrUtils.getLexerRule(ActionConditionLexer.ruleNames, operatorName);if (operator == ActionConditionLexer.OnBranch) {List<String> branchNames = new ArrayList<>();- for (RefInfo refInfo: Project.get().getBranches())+ for (RefInfo refInfo: Project.get().getBranchRefInfos())branchNames.add(GitUtils.ref2branch(refInfo.getRef().getName()));return SuggestionUtils.suggest(branchNames, matchWith);} else if (operator == ActionConditionLexer.Is) {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex c74db0fe26..77e2dd3849 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -38,14 +38,17 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {private final IModel<Project> projectModel;+ private final boolean withOrder;+private final boolean withCurrentUserCriteria;private final boolean withUnfinishedCriteria;- public BuildQueryBehavior(IModel<Project> projectModel, boolean withCurrentUserCriteria,- boolean withUnfinishedCriteria) {+ public BuildQueryBehavior(IModel<Project> projectModel, boolean withOrder,+ boolean withCurrentUserCriteria, boolean withUnfinishedCriteria) {super(BuildQueryParser.class, "query", false);this.projectModel = projectModel;+ this.withOrder = withOrder;this.withCurrentUserCriteria = withCurrentUserCriteria;this.withUnfinishedCriteria = withUnfinishedCriteria;}@@ -150,6 +153,8 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {+ if (!withOrder && suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.OrderBy)))+ return null;if (!withCurrentUserCriteria) {if (suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.SubmittedByMe))|| suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.CancelledByMe))) {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 8c919bacc2..ce602eab3a 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@@ -1,15 +1,15 @@package io.onedev.server.web.behavior;import static io.onedev.server.search.entity.EntityQuery.getValue;-import static io.onedev.server.search.entity.issue.IssueQuery.getRuleName;import static io.onedev.server.search.entity.issue.IssueQuery.checkField;import static io.onedev.server.search.entity.issue.IssueQuery.getOperator;+import static io.onedev.server.search.entity.issue.IssueQuery.getRuleName;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentBuild;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentPullRequest;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentCommit;import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedBy;import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedByMe;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsMe;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentBuild;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsCurrent;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsPrevious;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.OrderBy;import static io.onedev.server.util.query.IssueQueryConstants.FIELD_COMMENT;import static io.onedev.server.util.query.IssueQueryConstants.FIELD_COMMENT_COUNT;import static io.onedev.server.util.query.IssueQueryConstants.FIELD_DESCRIPTION;@@ -49,6 +49,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.issue.fieldspec.BooleanField;import io.onedev.server.issue.fieldspec.BuildChoiceField;import io.onedev.server.issue.fieldspec.ChoiceField;+import io.onedev.server.issue.fieldspec.CommitField;import io.onedev.server.issue.fieldspec.DateField;import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.issue.fieldspec.GroupChoiceField;@@ -73,16 +74,26 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {private final IModel<Project> projectModel;+ private final boolean withOrder;+private final boolean withCurrentUserCriteria;private final boolean withCurrentBuildCriteria;- public IssueQueryBehavior(IModel<Project> projectModel,- boolean withCurrentUserCriteria, boolean withCurrentBuildCriteria) {+ private final boolean withCurrentPullRequestCriteria;++ private final boolean withCurrentCommitCriteria;++ public IssueQueryBehavior(IModel<Project> projectModel, boolean withOrder,+ boolean withCurrentUserCriteria, boolean withCurrentBuildCriteria,+ boolean withCurrentPullRequestCriteria, boolean withCurrentCommitCriteria) {super(IssueQueryParser.class, "query", false);this.projectModel = projectModel;+ this.withOrder = withOrder;this.withCurrentUserCriteria = withCurrentUserCriteria;this.withCurrentBuildCriteria = withCurrentBuildCriteria;+ this.withCurrentPullRequestCriteria = withCurrentPullRequestCriteria;+ this.withCurrentCommitCriteria = withCurrentCommitCriteria;}@Override@@ -146,13 +157,18 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {if (fieldElements.isEmpty()) {if (operator == SubmittedBy)return SuggestionUtils.suggestUsers(matchWith);- else+ else if (operator == FixedInCurrentBuild)return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);+ else if (operator == FixedInCurrentPullRequest)+ return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);+ else+ return SuggestionUtils.suggestCommits(project, matchWith);} else {String fieldName = getValue(fieldElements.get(0).getMatchedText());try {- checkField(fieldName, operator);+ checkField(fieldName, operator, withCurrentUserCriteria, withCurrentBuildCriteria,+ withCurrentPullRequestCriteria, withCurrentCommitCriteria);FieldSpec fieldSpec = issueSetting.getFieldSpec(fieldName);if (fieldSpec instanceof DateField || fieldName.equals(FIELD_SUBMIT_DATE)|| fieldName.equals(FIELD_UPDATE_DATE)) {@@ -164,6 +180,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);} else if (fieldSpec instanceof BuildChoiceField) {return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);+ } else if (fieldSpec instanceof CommitField) {+ return SuggestionUtils.suggestCommits(project, matchWith);} else if (fieldSpec instanceof PullRequestChoiceField) {return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);} else if (fieldSpec instanceof BooleanField) {@@ -224,16 +242,12 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {- if (!withCurrentUserCriteria) {- if (suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(IsMe)))- return null;- }- if (!withCurrentBuildCriteria) {- if (suggestedLiteral.equals(getRuleName(FixedInCurrentBuild))- || suggestedLiteral.equals(getRuleName(IsCurrent))- || suggestedLiteral.equals(getRuleName(IsPrevious))) {- return null;- }+ if (!withOrder && suggestedLiteral.equals(getRuleName(OrderBy))+ || !withCurrentUserCriteria && suggestedLiteral.equals(getRuleName(SubmittedByMe))+ || !withCurrentBuildCriteria && suggestedLiteral.equals(getRuleName(FixedInCurrentBuild))+ || !withCurrentPullRequestCriteria && suggestedLiteral.equals(getRuleName(FixedInCurrentPullRequest))+ || !withCurrentCommitCriteria && suggestedLiteral.equals(getRuleName(FixedInCurrentCommit))) {+ return null;}parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {@@ -241,7 +255,9 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {if (!fieldElements.isEmpty()) {String fieldName = getValue(fieldElements.iterator().next().getMatchedText());try {- checkField(fieldName, getOperator(suggestedLiteral));+ checkField(fieldName, getOperator(suggestedLiteral),+ withCurrentUserCriteria, withCurrentBuildCriteria,+ withCurrentPullRequestCriteria, withCurrentCommitCriteria);} catch (OneException e) {return null;}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.javanew file mode 100644index 0000000000..74c0207e68--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java@@ -0,0 +1,110 @@+package io.onedev.server.web.behavior;++import java.util.ArrayList;+import java.util.List;++import org.apache.commons.lang3.StringUtils;++import com.google.common.base.Optional;+import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;++import io.onedev.commons.codeassist.AntlrUtils;+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.Element;+import io.onedev.commons.codeassist.parser.ParseExpect;+import io.onedev.commons.codeassist.parser.TerminalExpect;+import io.onedev.server.OneException;+import io.onedev.server.util.jobmatch.JobMatch;+import io.onedev.server.util.jobmatch.JobMatchLexer;+import io.onedev.server.util.jobmatch.JobMatchParser;+import io.onedev.server.util.query.BuildQueryConstants;+import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;+import io.onedev.server.web.util.SuggestionUtils;++@SuppressWarnings("serial")+public class JobMatchBehavior extends ANTLRAssistBehavior {++ public JobMatchBehavior() {+ super(JobMatchParser.class, "jobMatch", false);+ }++ @Override+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();+ if (spec.getRuleName().equals("Quoted")) {+ return new FenceAware(codeAssist.getGrammar(), '"', '"') {++ @Override+ protected List<InputSuggestion> match(String matchWith) {+ if ("criteriaField".equals(spec.getLabel())) {+ List<String> fields = Lists.newArrayList(+ BuildQueryConstants.FIELD_PROJECT,+ BuildQueryConstants.FIELD_PROJECT_OWNER,+ BuildQueryConstants.FIELD_JOB,+ BuildQueryConstants.FIELD_IMAGE);+ return SuggestionUtils.suggest(fields, matchWith);+ } else if ("criteriaValue".equals(spec.getLabel())) {+ List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);+ Preconditions.checkState(operatorElements.size() == 1);+ String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());+ int operator = AntlrUtils.getLexerRule(JobMatchLexer.ruleNames, operatorName);+ if (operator == JobMatchLexer.Is) {+ List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ Preconditions.checkState(fieldElements.size() == 1);+ String fieldName = JobMatch.getValue(fieldElements.get(0).getMatchedText());+ if (fieldName.equals(BuildQueryConstants.FIELD_PROJECT))+ return SuggestionUtils.suggestProjects(matchWith);+ else if (fieldName.equals(BuildQueryConstants.FIELD_PROJECT_OWNER))+ return SuggestionUtils.suggestUsers(matchWith);+ }+ }+ return null;+ }++ @Override+ protected String getFencingDescription() {+ return "quote as literal value";+ }++ }.suggest(terminalExpect);+ }+ }+ return null;+ }++ @Override+ protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {+ parseExpect = parseExpect.findExpectByLabel("operator");+ if (parseExpect != null) {+ List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);+ if (!fieldElements.isEmpty()) {+ String fieldName = JobMatch.getValue(fieldElements.iterator().next().getMatchedText());+ try {+ JobMatch.checkField(fieldName, AntlrUtils.getLexerRule(JobMatchLexer.ruleNames, suggestedLiteral));+ } catch (OneException e) {+ return null;+ }+ }+ }+ return super.describe(parseExpect, suggestedLiteral);+ }++ @Override+ protected List<String> getHints(TerminalExpect terminalExpect) {+ List<String> hints = new ArrayList<>();+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();+ if ("criteriaValue".equals(spec.getLabel())) {+ String unmatched = terminalExpect.getUnmatchedText();+ if (unmatched.indexOf('"') == unmatched.lastIndexOf('"')) // only when we input criteria value+ hints.add("Use * for wildcard match");+ }+ }+ return hints;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/UserMatcherBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/UserMatchBehavior.javasimilarity index 91%rename from server-core/src/main/java/io/onedev/server/web/behavior/UserMatcherBehavior.javarename to server-core/src/main/java/io/onedev/server/web/behavior/UserMatchBehavior.javaindex d7e6b3e570..395128ad0c 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/UserMatcherBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/UserMatchBehavior.java@@ -11,9 +11,9 @@ import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@SuppressWarnings("serial")-public class UserMatcherBehavior extends ANTLRAssistBehavior {+public class UserMatchBehavior extends ANTLRAssistBehavior {- public UserMatcherBehavior() {+ public UserMatchBehavior() {super(UserMatchParser.class, "userMatch", false);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchChoiceProvider.javadeleted file mode 100644index 2047d65430..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchChoiceProvider.java+++ /dev/null@@ -1,72 +0,0 @@-package io.onedev.server.web.component.branch.choice;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.List;--import org.apache.wicket.model.IModel;-import org.json.JSONException;-import org.json.JSONWriter;-import org.unbescape.html.HtmlEscape;--import io.onedev.server.git.GitUtils;-import io.onedev.server.git.RefInfo;-import io.onedev.server.model.Project;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.component.select2.ChoiceProvider;-import io.onedev.server.web.component.select2.Response;--@SuppressWarnings("serial")-public class BranchChoiceProvider extends ChoiceProvider<String> {-- private IModel<Project> projectModel;-- public BranchChoiceProvider(IModel<Project> projectModel) {- this.projectModel = projectModel;- }-- @Override- public void query(String term, int page, Response<String> response) {- term = term.toLowerCase();- List<String> branches = new ArrayList<>();- Project project = projectModel.getObject();- if (project != null) {- for (RefInfo ref: project.getBranches()) {- String branch = GitUtils.ref2branch(ref.getRef().getName());- if (branch.toLowerCase().startsWith(term))- branches.add(branch);- }- }-- Collections.sort(branches);-- int first = page * WebConstants.PAGE_SIZE;- int last = first + WebConstants.PAGE_SIZE;- response.setHasMore(last<branches.size());- if (last > branches.size())- last = branches.size();- response.addAll(branches.subList(first, last));- }-- @Override- public void toJson(String choice, JSONWriter writer) throws JSONException {- String escaped = HtmlEscape.escapeHtml5(choice);- writer.key("id").value(choice).key("name").value(escaped);- }-- @Override- public Collection<String> toChoices(Collection<String> ids) {- Collection<String> choices = new ArrayList<>();- for (String id: ids)- choices.add(HtmlEscape.unescapeHtml(id));- return choices;- }-- @Override- public void detach() {- projectModel.detach();-- super.detach();- }-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchMultiChoice.javaindex 6ba36122d9..dbf34a5020 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchMultiChoice.java@@ -1,19 +1,20 @@package io.onedev.server.web.component.branch.choice;import java.util.Collection;+import java.util.Map;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import io.onedev.server.web.component.select2.ChoiceProvider;import io.onedev.server.web.component.select2.Select2MultiChoice;+import io.onedev.server.web.component.stringchoice.StringChoiceProvider;@SuppressWarnings("serial")public class BranchMultiChoice extends Select2MultiChoice<String> {- public BranchMultiChoice(String id, IModel<Collection<String>> model, ChoiceProvider<String> provider) {- super(id, model, provider);+ public BranchMultiChoice(String id, IModel<Collection<String>> model, IModel<Map<String, String>> choicesModel) {+ super(id, model, new StringChoiceProvider(choicesModel));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchSingleChoice.javaindex d064af3c9b..6ae2488bc1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/choice/BranchSingleChoice.java@@ -1,18 +1,19 @@package io.onedev.server.web.component.branch.choice;+import java.util.Map;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import io.onedev.server.web.component.select2.ChoiceProvider;import io.onedev.server.web.component.select2.Select2Choice;+import io.onedev.server.web.component.stringchoice.StringChoiceProvider;@SuppressWarnings("serial")public class BranchSingleChoice extends Select2Choice<String> {- public BranchSingleChoice(String id, IModel<String> model,- ChoiceProvider<String> branchesProvider) {- super(id, model, branchesProvider);+ public BranchSingleChoice(String id, IModel<String> model, IModel<Map<String, String>> choicesModel) {+ super(id, model, new StringChoiceProvider(choicesModel));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.javaindex 5b4c9cfe98..e7a6c4aef2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java@@ -56,7 +56,7 @@ public abstract class BranchSelector extends Panel {this.projectModel = projectModel;this.branch = branch;- for (RefInfo ref: projectModel.getObject().getBranches())+ for (RefInfo ref: projectModel.getObject().getBranchRefInfos())branches.add(GitUtils.ref2branch(ref.getRef().getName()));filteredBranches.addAll(branches);diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex 306ef4b9ef..78dfdf001f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -24,7 +24,11 @@<a wicket:id="link"><span wicket:id="label"></span></a></wicket:fragment><wicket:fragment wicket:id="statusFrag">- <span wicket:id="icon"></span> <a wicket:id="link"><span wicket:id="label"></span></a>+ <span wicket:id="icon"></span>+ <a wicket:id="link">+ <span wicket:id="name"></span>+ <span wicket:id="date"></span>+ </a></wicket:fragment><wicket:fragment wicket:id="commitFrag"><a wicket:id="hashLink" class="hash"><span wicket:id="hash"></span></a>diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 668c7cb0a5..9c04c75892 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -61,6 +61,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalBuildSetting;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.query.BuildQueryConstants;@@ -328,7 +329,7 @@ public abstract class BuildListPanel extends Panel {return getProject();}- }, true, true));+ }, true, true, true));input.add(new AjaxFormComponentUpdatingBehavior("input"){@@ -469,19 +470,12 @@ public abstract class BuildListPanel extends Panel {return getBuildManager().load(buildId).getStatus();}- }) {-- @Override- protected Collection<String> getWebSocketObservables() {- return Sets.newHashSet(Build.getWebSocketObservable(buildId));- }-- });+ }));Link<Void> link = new BookmarkablePageLink<Void>("link", BuildDashboardPage.class,BuildDashboardPage.paramsOf(build, getQueryPosition(cellItem)));- link.add(new Label("label", new AbstractReadOnlyModel<String>() {+ link.add(new Label("name", new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {@@ -498,7 +492,17 @@ public abstract class BuildListPanel extends Panel {}});+ link.add(new Label("date", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return DateUtils.formatAge(rowModel.getObject().getStatusDate());+ }++ }));fragment.add(link);+ fragment.add(newBuildObserver(buildId));+ fragment.setOutputMarkupId(true);cellItem.add(fragment);}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/build-list.css b/server-core/src/main/java/io/onedev/server/web/component/build/list/build-list.cssindex 6751c8b74a..40d366eda3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/build-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/build-list.css@@ -18,4 +18,4 @@}.build-list>.head>.others>*:last-child {margin-right: 0;-}\ No newline at end of file+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.js b/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.jsindex c45af8017d..af1bb0e420 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.js+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.js@@ -2,6 +2,7 @@ onedev.server.buildLog = {onDomReady: function(containerId, logEntries, maxNumOfLogEntries) {var $buildLog = $("#" + containerId + ">.build-log");var ps = new PerfectScrollbar($buildLog[0]);+ $buildLog.data("ps", ps);$(window).resize(function() {ps.update();});@@ -35,7 +36,7 @@ onedev.server.buildLog = {} else {$buildLog.children(".no-entries").remove();}-+ $buildLog.data("ps").update();$buildLog.scrollTop($buildLog[0].scrollHeight);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.htmlindex 6eff251b75..eb62f4445e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="build-side"><div wicket:id="buildNav" class="nav"></div>- <div wicket:id="general" class="general">+ <div wicket:id="general" class="general properties"><div><div class="name">Commit</div><div class="value">@@ -24,10 +24,16 @@<div class="name">Submitted At</div><div class="value"><span wicket:id="submitDate"></span></div></div>- <wicket:enclosure child="waitingInQueue">+ <wicket:enclosure child="retryDate"><div>- <div class="name">Waiting in Queue</div>- <div class="value"><span wicket:id="waitingInQueue"></span></div>+ <div class="name">Retried At</div>+ <div class="value"><span wicket:id="retryDate"></span></div>+ </div>+ </wicket:enclosure>+ <wicket:enclosure child="waitingResources">+ <div>+ <div class="name">Waiting Resources</div>+ <div class="value"><span wicket:id="waitingResources"></span></div></div></wicket:enclosure><wicket:enclosure child="runningTakes">@@ -57,7 +63,7 @@</div></wicket:enclosure><wicket:enclosure child="params">- <div class="params table">+ <div class="params properties"><div wicket:id="params"><div wicket:id="name" class="name"></div><div wicket:id="value" class="value"></div>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 1b94e87e42..0cf5a94965 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@@ -36,6 +36,7 @@ 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.criteria.Criteria;import io.onedev.server.web.component.build.ParamValuesLabel;import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.job.JobDefLink;@@ -83,7 +84,22 @@ public abstract class BuildSidePanel extends Panel {});- WebMarkupContainer general = new WebMarkupContainer("general");+ WebMarkupContainer general = new WebMarkupContainer("general") {++ @Override+ protected void onBeforeRender() {+ User submitter = User.from(getBuild().getSubmitter(), getBuild().getSubmitterName());+ addOrReplace(new UserIdentPanel("submitter", submitter, Mode.NAME));+ User canceller = User.from(getBuild().getCanceller(), getBuild().getCancellerName());+ UserIdentPanel cancellerIdentPanel = new UserIdentPanel("canceller", canceller, Mode.NAME);+ cancellerIdentPanel.setVisible(getBuild().getStatus() == Build.Status.CANCELLED+ && (getBuild().getCanceller() != null || getBuild().getCancellerName() != null));+ addOrReplace(cancellerIdentPanel);+ super.onBeforeRender();+ }++ };+if (!getBuild().isFinished()) {general.add(new AjaxSelfUpdatingTimerBehavior(Duration.ONE_SECOND) {@@ -128,32 +144,37 @@ public abstract class BuildSidePanel extends Panel {jobLink.add(new Label("label", getBuild().getJobName()));general.add(jobLink);- general.add(new UserIdentPanel("submitter", User.from(getBuild().getSubmitter(), getBuild().getSubmitterName()), Mode.NAME));-- general.add(new UserIdentPanel("canceller", User.from(getBuild().getCanceller(), getBuild().getCancellerName()), Mode.NAME) {+ general.add(new Label("submitDate", new LoadableDetachableModel<String>() {@Override- protected void onConfigure() {- super.onConfigure();- setVisible(getBuild().getCanceller() != null || getBuild().getCancellerName() != null);+ protected String load() {+ return DateUtils.formatAge(getBuild().getSubmitDate());}- });-- general.add(new Label("submitDate", new LoadableDetachableModel<String>() {+ }));+ general.add(new Label("retryDate", new LoadableDetachableModel<String>() {@Overrideprotected String load() {- return DateUtils.formatAge(getBuild().getSubmitDate());+ return DateUtils.formatAge(getBuild().getRetryDate());}- }));+ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getBuild().getRetryDate() != null);+ }++ });- general.add(new Label("waitingInQueue", new LoadableDetachableModel<String>() {+ general.add(new Label("waitingResources", new LoadableDetachableModel<String>() {@Overrideprotected String load() {long duration;+if (getBuild().getRunningDate() != null)duration = getBuild().getRunningDate().getTime() - getBuild().getPendingDate().getTime();else@@ -230,7 +251,7 @@ public abstract class BuildSidePanel extends Panel {WebMarkupContainer dependencesContainer = new WebMarkupContainer("dependences");add(dependencesContainer);- String query = "depends on " + BuildQuery.quote(getBuild().getProject().getName() + "#" + getBuild().getNumber());+ String query = "depends on " + Criteria.quote(getBuild().getProject().getName() + "#" + getBuild().getNumber());Link<Void> dependentsLink = new BookmarkablePageLink<Void>("dependents", BuildListPage.class,BuildListPage.paramsOf(query, 0, getBuild().getDependents().size()));dependentsLink.setVisible(!getBuild().getDependents().isEmpty());@@ -238,7 +259,7 @@ public abstract class BuildSidePanel extends Panel {dependencesContainer.add(dependentsLink);- query = "dependencies of " + BuildQuery.quote(getBuild().getProject().getName() + "#" + getBuild().getNumber());+ query = "dependencies of " + Criteria.quote(getBuild().getProject().getName() + "#" + getBuild().getNumber());Link<Void> dependenciesLink = new BookmarkablePageLink<Void>("dependencies", BuildListPage.class,BuildListPage.paramsOf(query, 0, getBuild().getDependencies().size()));dependenciesLink.setVisible(!getBuild().getDependencies().isEmpty());diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/build-side.css b/server-core/src/main/java/io/onedev/server/web/component/build/side/build-side.cssindex e3b1b60f2f..e1ac2234ac 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/build-side.css+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/build-side.css@@ -7,22 +7,21 @@border-top: none;padding-top: 0;}-.build-side>.general {+.build-side>.properties {width: 100%;display: table;}-.build-side>.general>div {+.build-side>.properties>div {display: table-row;}-.build-side>.general>div>div {+.build-side>.properties>div>div {display: table-cell;padding: 8px 0;}-.build-side>.general>div>div.name {+.build-side>.properties>div>div.name {padding-right: 12px;width: 50%;}-.build-side>.pull-requests>.head {font-weight: bold;margin-bottom: 8px;diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex f362c8f504..e748051c6b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -198,8 +198,8 @@ public abstract class CommitListPanel extends Panel {@Overrideprotected Map<String, List<String>> load() {Map<String, List<String>> labels = new HashMap<>();- List<RefInfo> refInfos = getProject().getBranches();- refInfos.addAll(getProject().getTags());+ List<RefInfo> refInfos = getProject().getBranchRefInfos();+ refInfos.addAll(getProject().getTagRefInfos());for (RefInfo refInfo: refInfos) {if (refInfo.getPeeledObj() instanceof RevCommit) {RevCommit commit = (RevCommit) refInfo.getPeeledObj();diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex ff0eeb3f29..d636f5a862 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -204,7 +204,7 @@ public class RevisionDiffPanel extends Panel {String patternSetString = pathFilterModel.getObject();if (StringUtils.isNotBlank(patternSetString)) {try {- PatternSet patternSet = PatternSet.fromString(patternSetString.toLowerCase());+ PatternSet patternSet = PatternSet.parse(patternSetString.toLowerCase());Matcher matcher = new PathMatcher();for (BlobChange change: changes) {String oldPath = change.getOldBlobIdent().path;@@ -623,7 +623,7 @@ public class RevisionDiffPanel extends Panel {super.onConfigure();try {if (StringUtils.isNotBlank(pathFilterModel.getObject()))- PatternSet.fromString(pathFilterModel.getObject());+ PatternSet.parse(pathFilterModel.getObject());setVisible(false);} catch (Exception e) {setVisible(true);diff --git a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.jsindex 1bdf757fc3..c9abef826e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js+++ b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js@@ -43,7 +43,7 @@ onedev.server.floating = {}var openTriggered = false;- $floating.data("elementReplaced", function() {+ $floating.data("afterElementReplace", function() {if ($floating.data("alignment"))$floating.align($floating.data("alignment"));if (!openTriggered) {@@ -51,7 +51,7 @@ onedev.server.floating = {openTriggered = true;}});- $(document).on("elementReplaced", $floating.data("elementReplaced"));+ $(document).on("afterElementReplace", $floating.data("afterElementReplace"));},close: function($floating, callCloseCallback) {@@ -66,7 +66,7 @@ onedev.server.floating = {$(document).off("mouseup touchstart", $floating.data("mouseUpOrTouchStart"));$(document).off("keydown", $floating.data("keydown"));- $(document).off("elementReplaced", $floating.data("elementReplaced"));+ $(document).off("afterElementReplace", $floating.data("afterElementReplace"));$floating.trigger("close");diff --git a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.javaindex ed6f1b55e2..aad6759d1d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java@@ -1,9 +1,10 @@package io.onedev.server.web.component.groupchoice;-import java.util.ArrayList;-import java.util.Comparator;+import java.util.Collection;import java.util.List;+import org.apache.wicket.model.IModel;+import io.onedev.server.model.Group;import io.onedev.server.util.match.MatchScoreProvider;import io.onedev.server.util.match.MatchScoreUtils;@@ -15,16 +16,21 @@ public class GroupChoiceProvider extends AbstractGroupChoiceProvider {private static final long serialVersionUID = 1L;- private final List<Group> choices;+ private final IModel<Collection<Group>> choicesModel;- public GroupChoiceProvider(List<Group> choices) {- this.choices = new ArrayList<>(choices);- this.choices.sort(Comparator.comparing(Group::getName));+ public GroupChoiceProvider(IModel<Collection<Group>> choicesModel) {+ this.choicesModel = choicesModel;}+ @Override+ public void detach() {+ choicesModel.detach();+ super.detach();+ }+@Overridepublic void query(String term, int page, Response<Group> response) {- List<Group> matched = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<Group>() {+ List<Group> matched = MatchScoreUtils.filterAndSort(choicesModel.getObject(), new MatchScoreProvider<Group>() {@Overridepublic double getMatchScore(Group object) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.javaindex 3e7770c3e4..00ad5cc487 100644--- a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java@@ -12,9 +12,8 @@ import io.onedev.server.web.component.select2.Select2MultiChoice;@SuppressWarnings("serial")public class GroupMultiChoice extends Select2MultiChoice<Group> {- public GroupMultiChoice(String id, IModel<Collection<Group>> groupsModel,- AbstractGroupChoiceProvider choiceProvider) {- super(id, groupsModel, choiceProvider);+ public GroupMultiChoice(String id, IModel<Collection<Group>> selectionsModel, IModel<Collection<Group>> choicesModel) {+ super(id, selectionsModel, new GroupChoiceProvider(choicesModel));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.javaindex 8199aeaf76..0736a32cc7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.groupchoice;+import java.util.Collection;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;@@ -10,9 +12,8 @@ import io.onedev.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")public class GroupSingleChoice extends Select2Choice<Group> {- public GroupSingleChoice(String id, IModel<Group> groupModel,- AbstractGroupChoiceProvider choiceProvider) {- super(id, groupModel, choiceProvider);+ public GroupSingleChoice(String id, IModel<Group> selectionModel, IModel<Collection<Group>> choicesModel) {+ super(id, selectionModel, new GroupChoiceProvider(choicesModel));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.javaindex 233b9a341f..5d87aeb129 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java@@ -27,7 +27,6 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.http.WebResponse;-import org.eclipse.jgit.lib.ObjectId;import com.google.common.collect.Lists;@@ -132,12 +131,8 @@ public abstract class IssueActivitiesPanel extends Panel {otherActivities.add(new IssueChangeActivity(change));} else if (change.getData() instanceof IssueCommittedData && SecurityUtils.canReadCode(getIssue().getProject())) {IssueCommittedData issueCommittedData = (IssueCommittedData) change.getData();- for (String commitHash: issueCommittedData.getCommitHashes()) {- if (getIssue().getProject().getRepository().hasObject(ObjectId.fromString(commitHash))) {- otherActivities.add(new IssueChangeActivity(change));- break;- }- }+ if (getIssue().getProject().getRevCommit(issueCommittedData.getCommitHash(), false) != null)+ otherActivities.add(new IssueChangeActivity(change));} else if (change.getData() instanceof IssuePullRequestData && SecurityUtils.canReadCode(getIssue().getProject())) {IssuePullRequestData issuePullRequestData = (IssuePullRequestData) change.getData();if (issuePullRequestData.getPullRequest() != null)diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.htmlindex 75f41ef123..8153866db6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.html@@ -1,20 +1,14 @@<wicket:panel>- <table class="commits">- <tr wicket:id="commits">- <td class="author"><span wicket:id="author"></span></td>- <td class="message">- <div wicket:id="message"></div>- </td>- <td class="hash-and-status clearfix">- <span class="btn-group pull-right browse">- <a wicket:id="browseCode" title="Browse code" class="btn btn-default btn-xs"><i class="fa fa-file-text-o"></i></a>- </span>- <span class="btn-group pull-right hash">- <a wicket:id="hashLink" class="hash btn btn-xs btn-default"><span wicket:id="hash"></span></a>- <a wicket:id="copyHash" class="btn btn-xs btn-default"><i class="fa fa-clipboard"></i></a>- </span>- <span wicket:id="buildStatus" class="build-status pull-right"></span>- </td>- </tr>- </table>+ <div class="commit clearfix">+ <div wicket:id="author" class="author pull-left"></div>+ <div wicket:id="message" class="message pull-left"></div>+ <div class="btn-group pull-right browse">+ <a wicket:id="browseCode" title="Browse code" class="btn btn-default btn-xs"><i class="fa fa-file-text-o"></i></a>+ </div>+ <div class="btn-group pull-right hash">+ <a wicket:id="hashLink" class="hash btn btn-xs btn-default"><span wicket:id="hash"></span></a>+ <a wicket:id="copyHash" class="btn btn-xs btn-default"><i class="fa fa-clipboard"></i></a>+ </div>+ <div wicket:id="buildStatus" class="build-status pull-right"></div>+ </div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.javaindex 59c0da8d14..cb17b1e440 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.java@@ -1,18 +1,14 @@package io.onedev.server.web.component.issue.activities.activity;-import java.util.ArrayList;-import java.util.List;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.server.git.BlobIdent;@@ -29,79 +25,68 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;@SuppressWarnings("serial")-public abstract class IssueCommittedPanel extends GenericPanel<List<RevCommit>> {+public abstract class IssueCommittedPanel extends GenericPanel<RevCommit> {- private final List<String> commitHashes;+ private final String commitHash;- public IssueCommittedPanel(String id, List<String> commitHashes) {+ public IssueCommittedPanel(String id, String commitHash) {super(id);- this.commitHashes = commitHashes;+ this.commitHash = commitHash;++ setModel(new LoadableDetachableModel<RevCommit>() {++ @Override+ protected RevCommit load() {+ return getIssue().getProject().getRevCommit(commitHash, true);+ }++ });}@Overrideprotected void onInitialize() {super.onInitialize();- add(new ListView<RevCommit>("commits", new LoadableDetachableModel<List<RevCommit>>() {+ RevCommit commit = getModelObject();++ add(new PersonIdentPanel("author", commit.getAuthorIdent(), "Author", Mode.AVATAR));++ add(new CommitMessagePanel("message", getModel()) {@Override- protected List<RevCommit> load() {- List<RevCommit> commits = new ArrayList<>();- for (String commitHash: commitHashes) {- RevCommit commit = getIssue().getProject().getRevCommit(commitHash, false);- if (commit != null)- commits.add(commit);- }- return commits;+ protected Project getProject() {+ return getIssue().getProject();}- }) {+ });+ add(new CommitStatusPanel("buildStatus", ObjectId.fromString(commitHash)) {+@Override- protected void populateItem(final ListItem<RevCommit> item) {- RevCommit commit = item.getModelObject();-- item.add(new PersonIdentPanel("author", commit.getAuthorIdent(), "Author", Mode.AVATAR));-- item.add(new CommitMessagePanel("message", item.getModel()) {-- @Override- protected Project getProject() {- return getIssue().getProject();- }-- });-- item.add(new CommitStatusPanel("buildStatus", commit.copy()) {-- @Override- protected String getCssClasses() {- return "btn btn-default btn-xs";- }-- @Override- protected Project getProject() {- return getIssue().getProject();- }-- });-- Project project = getIssue().getProject();- CommitDetailPage.State commitState = new CommitDetailPage.State();- commitState.revision = commit.name();- PageParameters params = CommitDetailPage.paramsOf(project, commitState);- Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);- item.add(hashLink);- hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));- item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));+ protected String getCssClasses() {+ return "btn btn-default btn-xs";+ }- BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);- ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);- params = ProjectBlobPage.paramsOf(project, browseState);- item.add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));+ @Override+ protected Project getProject() {+ return getIssue().getProject();}});++ Project project = getIssue().getProject();+ CommitDetailPage.State commitState = new CommitDetailPage.State();+ commitState.revision = commit.name();+ PageParameters params = CommitDetailPage.paramsOf(project, commitState);+ Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);+ add(hashLink);+ hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));+ add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));++ BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);+ ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);+ params = ProjectBlobPage.paramsOf(project, browseState);+ add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));}protected abstract Issue getIssue();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.cssindex 5dc61bc6ca..0687fb823f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css@@ -59,21 +59,18 @@.issue-activities .activity>.content>.body .plain.diff>tbody>tr>td {background: none !important;}-.issue-activities .activity>.content>.body>.commits td {+.issue-activities .activity>.content>.body>.commit {color: #888;- padding: 4px 0;}-.issue-activities .activity>.content>.body>.commits tr:hover td {- background: #F5F5F5;-}-.issue-activities .activity>.content>.body>.commits td.author {+.issue-activities .activity>.content>.body>.commit .author {width: 28px;}-.issue-activities .activity>.content>.body>.commits td.hash-and-status {- width: 170px;+.issue-activities .activity>.content>.body>.commit .message {+ margin-right: 8px;}-.issue-activities .activity>.content>.body>.commits td.hash-and-status>span {+.issue-activities .activity>.content>.body>.commit .pull-right {margin-left: 4px;+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;}.issue-activities .activity>.content>.head a {color: #999;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.htmlindex 9fb8ea2bb4..ab3f330780 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html@@ -6,4 +6,14 @@<wicket:fragment wicket:id="linkFrag"><a wicket:id="link"><span wicket:id="label"></span></a></wicket:fragment>+ <wicket:fragment wicket:id="commitFrag">+ <span class="btn-group">+ <a wicket:id="hashLink" class="hash btn btn-xs btn-default"><span wicket:id="hash"></span></a>+ <a wicket:id="copyHash" class="btn btn-xs btn-default"><i class="fa fa-clipboard"></i></a>+ </span>+ </wicket:fragment>+ <wicket:fragment wicket:id="notAccessibleCommitFrag">+ <span wicket:id="hash"></span>+ <a wicket:id="copyHash"><i class="fa fa-clipboard"></i></a>+ </wicket:fragment></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex a01a9028c3..3faf688e61 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@@ -13,6 +13,9 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;import org.unbescape.html.HtmlEscape;import io.onedev.server.OneDev;@@ -22,10 +25,12 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.git.GitUtils;import io.onedev.server.issue.fieldspec.ChoiceField;import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;@@ -33,20 +38,27 @@ import io.onedev.server.util.ColorUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.Input;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;@SuppressWarnings("serial")public abstract class FieldValuesPanel extends Panel implements EditContext {- public FieldValuesPanel(String id) {+ private final Mode userFieldDisplayMode;++ public FieldValuesPanel(String id, Mode userFieldDisplayMode) {super(id);+ this.userFieldDisplayMode = userFieldDisplayMode;}private GlobalIssueSetting getIssueSetting() {@@ -66,7 +78,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {String value = item.getModelObject();if (getField().getType().equals(FieldSpec.USER)) {User user = User.from(OneDev.getInstance(UserManager.class).findByName(value), value);- item.add(new UserIdentPanel("value", user, Mode.NAME));+ item.add(new UserIdentPanel("value", user, userFieldDisplayMode));} else if (getField().getType().equals(FieldSpec.ISSUE)) {Issue issue = OneDev.getInstance(IssueManager.class).find(getIssue().getProject(), Long.valueOf(value));@@ -83,7 +95,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {} else if (getField().getType().equals(FieldSpec.BUILD)) {Build build = OneDev.getInstance(BuildManager.class).find(getIssue().getProject(), Long.valueOf(value));- if (build != null) {+ if (build != null && SecurityUtils.canAccess(build)) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);Link<Void> link = new BookmarkablePageLink<Void>("link",BuildDashboardPage.class, BuildDashboardPage.paramsOf(build, null));@@ -96,7 +108,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {} else if (getField().getType().equals(FieldSpec.PULLREQUEST)) {PullRequest request = OneDev.getInstance(PullRequestManager.class).find(getIssue().getProject(), Long.valueOf(value));- if (request != null) {+ if (request != null && SecurityUtils.canReadCode(request.getTargetProject())) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class,PullRequestActivitiesPage.paramsOf(request, null));@@ -106,6 +118,28 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {} else {item.add(new Label("value", "#" + value));}+ } else if (getField().getType().equals(FieldSpec.COMMIT)) {+ if (ObjectId.isId(value)) {+ if (SecurityUtils.canReadCode(getIssue().getProject())) {+ Fragment fragment = new Fragment("value", "commitFrag", FieldValuesPanel.this);+ Project project = getIssue().getProject();+ CommitDetailPage.State commitState = new CommitDetailPage.State();+ commitState.revision = value;+ PageParameters params = CommitDetailPage.paramsOf(project, commitState);+ Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);+ fragment.add(hashLink);+ hashLink.add(new Label("hash", GitUtils.abbreviateSHA(value)));+ fragment.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(value))));+ item.add(fragment);+ } else {+ Fragment fragment = new Fragment("value", "notAccessibleCommitFrag", FieldValuesPanel.this);+ fragment.add(new Label("hash", GitUtils.abbreviateSHA(value)));+ fragment.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(value))));+ item.add(fragment);+ }+ } else {+ item.add(new Label("value", value));+ }} else {Label label;if (getField().getType().equals(ParamSpec.SECRET))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 7a34ad803b..e01e3db033 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@@ -99,7 +99,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected IssueQuery load() {try {- IssueQuery additionalQuery = IssueQuery.parse(getProject(), query, true, true, false);+ IssueQuery additionalQuery = IssueQuery.parse(getProject(), query, true, true, false, false, false);return IssueQuery.merge(getBaseQuery(), additionalQuery);} catch (Exception e) {logger.error("Error parsing issue query: " + query, e);@@ -221,7 +221,7 @@ public abstract class IssueListPanel extends Panel {return getProject();}- }, true, false));+ }, true, true, false, false, false));input.add(new AjaxFormComponentUpdatingBehavior("input"){@@ -597,7 +597,7 @@ public abstract class IssueListPanel extends Panel {RepeatingView fieldsView = new RepeatingView("fields");for (String field: getListFields()) {- fieldsView.add(new FieldValuesPanel(fieldsView.newChildId()) {+ fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR_AND_NAME) {@Overrideprotected Issue getIssue() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.htmlindex daf850af74..81981117c4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html@@ -1,10 +1,10 @@<wicket:panel><div class="issue-operations"><div class="state-and-actions clearfix">- <div wicket:id="state" class="pull-left"></div>- <wicket:enclosure child="transitions">+ <div wicket:id="state" class="pull-left state">+ <div wicket:id="state"></div>+ </div><a wicket:id="transitions" class="btn btn-primary btn-sm pull-left"><span wicket:id="label"></span></a>- </wicket:enclosure><a wicket:id="newIssue" class="new-issue pull-left btn btn-success btn-sm"><i class="fa fa-plus"></i> New Issue</a><a wicket:id="moreInfo" class="more-info" title="More info"><i class="fa fa-ellipsis-h"></i></a></div>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 8611683cc6..4931476e44 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@@ -13,8 +13,7 @@ import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.event.Broadcast;-import org.apache.wicket.event.IEvent;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -24,6 +23,7 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.cycle.RequestCycle;@@ -42,14 +42,15 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.util.Input;import io.onedev.server.util.IssueUtils;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.query.IssueQueryConstants;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;-import io.onedev.server.web.component.sideinfo.SideInfoClosed;-import io.onedev.server.web.component.sideinfo.SideInfoOpened;+import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.util.ProjectAttachmentSupport;@@ -79,7 +80,9 @@ public abstract class IssueOperationsPanel extends Panel {protected void onInitialize() {super.onInitialize();- add(new IssueStateLabel("state", new AbstractReadOnlyModel<Issue>() {+ WebMarkupContainer stateContainer = new WebMarkupContainer("state");+ add(stateContainer);+ stateContainer.add(new IssueStateLabel("state", new AbstractReadOnlyModel<Issue>() {@Overridepublic Issue getObject() {@@ -93,108 +96,114 @@ public abstract class IssueOperationsPanel extends Panel {GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();List<TransitionSpec> transitions = getIssue().getProject().getIssueSetting().getTransitionSpecs(true);for (TransitionSpec transition: transitions) {- if (transition.canTransite(getIssue()) && transition.getTrigger() instanceof PressButtonTrigger) {+ if (transition.canTransitManually(getIssue(), null)) {PressButtonTrigger trigger = (PressButtonTrigger) transition.getTrigger();- if (trigger.isAuthorized(getIssue().getProject())) {- AjaxLink<Void> link = new AjaxLink<Void>(transitionsView.newChildId()) {-- private String comment;+ AjaxLink<Void> link = new AjaxLink<Void>(transitionsView.newChildId()) {++ private String comment;++ @Override+ public void onClick(AjaxRequestTarget target) {+ Fragment fragment = new Fragment(ACTION_OPTIONS_ID, "transitionFrag", IssueOperationsPanel.this);+ Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass(getIssue().getProject());+ Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ }++ };++ Collection<String> propertyNames = IssueUtils.getPropertyNames(getIssue().getProject(),+ fieldBeanClass, trigger.getPromptFields());+ BeanEditor editor = BeanContext.edit("fields", fieldBean, propertyNames, false);+ form.add(editor);- @Override- public void onClick(AjaxRequestTarget target) {- Fragment fragment = new Fragment(ACTION_OPTIONS_ID, "transitionFrag", IssueOperationsPanel.this);- Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass(getIssue().getProject());- Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onError() {- super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);- }-- };+ form.add(new CommentInput("comment", new PropertyModel<String>(this, "comment"), false) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getProject(), getIssue().getUUID());+ }++ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }- Collection<String> propertyNames = IssueUtils.getPropertyNames(getIssue().getProject(),- fieldBeanClass, trigger.getPromptFields());- BeanEditor editor = BeanContext.edit("fields", fieldBean, propertyNames, false);- form.add(editor);+ @Override+ protected List<AttributeModifier> getInputModifiers() {+ return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));+ }- form.add(new CommentInput("comment", new PropertyModel<String>(this, "comment"), false) {-- @Override- protected AttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(getProject(), getIssue().getUUID());- }-- @Override- protected Project getProject() {- return getIssue().getProject();- }-- @Override- protected List<AttributeModifier> getInputModifiers() {- return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));- }-- });-- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- getIssue().removeFields(transition.getRemoveFields());- Map<String, Object> fieldValues = IssueUtils.getFieldValues(- editor.newComponentContext(), fieldBean, trigger.getPromptFields());- IssueChangeManager manager = OneDev.getInstance(IssueChangeManager.class);- manager.changeState(getIssue(), transition.getToState(), fieldValues, comment);- onStateChanged(target);- }-- });+ });++ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ getIssue().removeFields(transition.getRemoveFields());+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(+ editor.newComponentContext(), fieldBean, trigger.getPromptFields());+ IssueChangeManager manager = OneDev.getInstance(IssueChangeManager.class);+ manager.changeState(getIssue(), transition.getToState(), fieldValues, comment);+ onStateChanged(target);+ }- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- newEmptyActionOptions(target);- }-- });- fragment.add(form);+ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ newEmptyActionOptions(target);+ }- fragment.setOutputMarkupId(true);- IssueOperationsPanel.this.replace(fragment);- target.add(fragment);- }+ });+ fragment.add(form);- };- link.add(new Label("label", trigger.getButtonLabel()));- transitionsView.add(link);- }+ fragment.setOutputMarkupId(true);+ IssueOperationsPanel.this.replace(fragment);+ target.add(fragment);+ }++ };+ link.add(new Label("label", trigger.getButtonLabel()));+ transitionsView.add(link);}}add(transitionsView);List<String> criterias = new ArrayList<>();- if (getIssue().getMilestone() != null)- criterias.add(IssueQuery.quote(IssueQueryConstants.FIELD_MILESTONE) + " is " + IssueQuery.quote(getIssue().getMilestoneName()));+ if (getIssue().getMilestone() != null) {+ criterias.add(Criteria.quote(IssueQueryConstants.FIELD_MILESTONE) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + Criteria.quote(getIssue().getMilestoneName()));+ }for (Map.Entry<String, Input> entry: getIssue().getFieldInputs().entrySet()) {if (getIssue().isFieldVisible(entry.getKey())) {List<String> strings = entry.getValue().getValues();if (strings.isEmpty()) {- criterias.add(IssueQuery.quote(entry.getKey()) + " is empty");+ criterias.add(Criteria.quote(entry.getKey()) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty));} else {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));+ for (String string: strings) {+ criterias.add(Criteria.quote(entry.getKey()) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "+ + Criteria.quote(string));+ }} else if (!(field instanceof DateField)) {- criterias.add(IssueQuery.quote(entry.getKey()) + " is " + IssueQuery.quote(strings.iterator().next()));+ criterias.add(Criteria.quote(entry.getKey()) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + Criteria.quote(strings.iterator().next()));}}}@@ -206,28 +215,23 @@ public abstract class IssueOperationsPanel extends Panel {elsequery = null;- add(newCreateIssueButton("newIssue", query));+ Component createIssueButton = newCreateIssueButton("newIssue", query);+ add(createIssueButton);- add(new AjaxLink<Void>("moreInfo") {-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (event.getPayload() instanceof SideInfoClosed) {- SideInfoClosed moreInfoSideClosed = (SideInfoClosed) event.getPayload();- setVisible(true);- moreInfoSideClosed.getHandler().add(this);- }- }+ stateContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {@Override- public void onClick(AjaxRequestTarget target) {- setVisible(false);- target.add(this);- send(getPage(), Broadcast.BREADTH, new SideInfoOpened(target));+ protected String load() {+ createIssueButton.configure();+ if (createIssueButton.isVisible() || transitionsView.size() != 0)+ return "with-separator";+ else+ return "";}- }.setOutputMarkupPlaceholderTag(true));+ }));++ add(new SideInfoLink("moreInfo"));newEmptyActionOptions(null);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.cssindex ffeacc4628..fa6ca8df78 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css@@ -6,10 +6,17 @@padding-right: 30px;position: relative;}-.issue-operations>.state-and-actions>.issue-state {+.issue-operations>.state-and-actions>.state {+ margin-right: 16px;+ padding-right: 16px;+}+.issue-operations>.state-and-actions>.state.with-separator {+ border-right: 1px solid #E0E0E0;+}+.issue-operations>.state-and-actions>.state>.issue-state {font-size: 16px;padding: 7px 24px;- margin-right: 32px;+ display: block;}.issue-operations>.state-and-actions>* {margin-right: 10px;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 ab372b3945..6a4fc9eade 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@@ -88,7 +88,7 @@ public abstract class IssueSidePanel extends Panel {@Overrideprotected EntityQuery<Issue> parse(String queryString) {- return IssueQuery.parse(getProject(), queryString, true, true, false);+ return IssueQuery.parse(getProject(), queryString, true, true, false, false, false);}@Override@@ -168,7 +168,7 @@ public abstract class IssueSidePanel extends Panel {protected void populateItem(ListItem<Input> item) {Input field = item.getModelObject();item.add(new Label("name", field.getName()));- item.add(new FieldValuesPanel("values") {+ item.add(new FieldValuesPanel("values", Mode.NAME) {@Overrideprotected Issue getIssue() {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 f56899d31c..edd94870a6 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@@ -41,7 +41,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.BeanContext;-import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;import io.onedev.server.web.util.ConfirmOnClick;@@ -144,7 +143,24 @@ public abstract class StateTransitionListPanel extends Panel {@Overrideprotected Component newLabel(String componentId) {- return new Label(componentId, EditableUtils.getDisplayName(transition.getTrigger().getClass()));+ return new Label(componentId, transition.getTrigger().getDescription());+ }++ });+ }++ });++ columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("Applicable Issues")) {++ @Override+ public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {+ TransitionSpec transition = rowModel.getObject();+ cellItem.add(new ColumnFragment(componentId, transition) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, transition.getTrigger().getIssueQuery());}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobMultiChoice.javaindex 1978c22370..4ff8eaf1f0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobMultiChoice.java@@ -1,14 +1,10 @@package io.onedev.server.web.component.job;import java.util.Collection;-import java.util.LinkedHashMap;-import java.util.List;import java.util.Map;import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import io.onedev.server.model.Project;import io.onedev.server.web.component.select2.Select2MultiChoice;import io.onedev.server.web.component.stringchoice.StringChoiceProvider;@@ -16,21 +12,8 @@ public class JobMultiChoice extends Select2MultiChoice<String> {private static final long serialVersionUID = 1L;- public JobMultiChoice(String id, IModel<Collection<String>> model) {- super(id, model, new StringChoiceProvider(new LoadableDetachableModel<Map<String, String>>() {-- private static final long serialVersionUID = 1L;-- @Override- protected Map<String, String> load() {- Map<String, String> choices = new LinkedHashMap<>();- List<String> jobNames = Project.get().getJobNames();- for (String jobName: jobNames)- choices.put(jobName, jobName);- return choices;- }-- }));+ public JobMultiChoice(String id, IModel<Collection<String>> model, IModel<Map<String, String>> choicesModel) {+ super(id, model, new StringChoiceProvider(choicesModel));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.javaindex faa39483d1..ca9722208e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobSingleChoice.java@@ -1,13 +1,9 @@package io.onedev.server.web.component.job;-import java.util.LinkedHashMap;-import java.util.List;import java.util.Map;import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import io.onedev.server.model.Project;import io.onedev.server.web.component.select2.Select2Choice;import io.onedev.server.web.component.stringchoice.StringChoiceProvider;@@ -15,21 +11,8 @@ public class JobSingleChoice extends Select2Choice<String> {private static final long serialVersionUID = 1L;- public JobSingleChoice(String id, IModel<String> model) {- super(id, model, new StringChoiceProvider(new LoadableDetachableModel<Map<String, String>>() {-- private static final long serialVersionUID = 1L;-- @Override- protected Map<String, String> load() {- Map<String, String> choices = new LinkedHashMap<>();- List<String> jobNames = Project.get().getJobNames();- for (String jobName: jobNames)- choices.put(jobName, jobName);- return choices;- }-- }));+ public JobSingleChoice(String id, IModel<String> model, IModel<Map<String, String>> choicesModel) {+ super(id, model, new StringChoiceProvider(choicesModel));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.cssindex 1ca2964fa3..aee3794e2f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css@@ -230,10 +230,6 @@ body.fullscreen {border: 2px solid #69B7F7;}-.markdown-rendered {- font-size: 16px;- line-height: 1.5;-}.markdown-rendered li {margin-bottom: 6px;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex ff70649d95..fca78cd6e6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -810,7 +810,7 @@ onedev.server.markdown = {if (autosaveKey) {onedev.server.form.registerAutosaveKey($container.closest("form.leave-confirm"), autosaveKey);var autosaveValue = localStorage.getItem(autosaveKey);- if (autosaveValue) {+ if (autosaveValue && $input.val() != autosaveValue) {$input.val(autosaveValue);$warning.show();if (!$resizeHandles.is(":visible"))diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.javaindex 154520b7a8..041bbe8045 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java@@ -89,10 +89,10 @@ public abstract class RevisionSelector extends Panel {List<String> names = new ArrayList<>();if (branchesActive) {- for (RefInfo ref: projectModel.getObject().getBranches())+ for (RefInfo ref: projectModel.getObject().getBranchRefInfos())names.add(GitUtils.ref2branch(ref.getRef().getName()));} else {- for (RefInfo ref: projectModel.getObject().getTags())+ for (RefInfo ref: projectModel.getObject().getTagRefInfos())names.add(GitUtils.ref2tag(ref.getRef().getName()));}return names;diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.javanew file mode 100644index 0000000000..d2c8fa583d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java@@ -0,0 +1,37 @@+package io.onedev.server.web.component.sideinfo;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;++@SuppressWarnings("serial")+public class SideInfoLink extends AjaxLink<Void> {++ public SideInfoLink(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ setOutputMarkupId(true);+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof SideInfoClosed) {+ SideInfoClosed moreInfoSideClosed = (SideInfoClosed) event.getPayload();+ moreInfoSideClosed.getHandler().appendJavaScript(+ String.format("$('#%s').show();", getMarkupId()));+ }+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ target.appendJavaScript(String.format("$('#%s').hide();", getMarkupId()));+ send(getPage(), Broadcast.BREADTH, new SideInfoOpened(target));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.javaindex e9842712b2..50d414a6b1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java@@ -10,8 +10,8 @@ import io.onedev.server.web.component.select2.Select2MultiChoice;@SuppressWarnings("serial")public class StringMultiChoice extends Select2MultiChoice<String> {- public StringMultiChoice(String id, IModel<Collection<String>> model, IModel<Map<String, String>> choicesModel) {- super(id, model, new StringChoiceProvider(choicesModel));+ public StringMultiChoice(String id, IModel<Collection<String>> selectionsModel, IModel<Map<String, String>> choicesModel) {+ super(id, selectionsModel, new StringChoiceProvider(choicesModel));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.javaindex 67e1d7e2d1..a1924db6cf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java@@ -9,8 +9,8 @@ import io.onedev.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")public class StringSingleChoice extends Select2Choice<String> {- public StringSingleChoice(String id, IModel<String> model, IModel<Map<String, String>> choicesModel) {- super(id, model, new StringChoiceProvider(choicesModel));+ public StringSingleChoice(String id, IModel<String> selectionModel, IModel<Map<String, String>> choicesModel) {+ super(id, selectionModel, new StringChoiceProvider(choicesModel));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java b/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.javaindex b18c6c490e..d2e8ef3018 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java@@ -11,7 +11,10 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.search.entity.project.ProjectQuery;+import io.onedev.server.search.entity.project.ProjectQueryLexer;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.query.ProjectQueryConstants;import io.onedev.server.web.component.modal.confirm.ConfirmModal;import io.onedev.server.web.component.modal.message.MessageModal;import io.onedev.server.web.page.project.ProjectListPage;@@ -30,8 +33,10 @@ public abstract class UserDeleteLink extends AjaxLink<Void> {@Overrideprotected Component newMessageContent(String componentId) {- String quotedName = ProjectQuery.quote(getUser().getName());- PageParameters params = ProjectListPage.paramsOf("\"Owner\" is " + quotedName, 0, 0);+ String query = Criteria.quote(ProjectQueryConstants.FIELD_OWNER) + " "+ + ProjectQuery.getRuleName(ProjectQueryLexer.Is) + " "+ + Criteria.quote(getUser().getName());+ PageParameters params = ProjectListPage.paramsOf(query, 0, 0);String url = RequestCycle.get().urlFor(ProjectListPage.class, params).toString();String html = String.format("There are <a href='%s'>projects owned by this user</a>. "+ "Please change owner of these projects to be under other users, or delete "diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.javaindex c0957a2bbe..70f0612174 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java@@ -1,9 +1,10 @@package io.onedev.server.web.component.user.choice;-import java.util.ArrayList;-import java.util.Comparator;+import java.util.Collection;import java.util.List;+import org.apache.wicket.model.IModel;+import io.onedev.server.model.User;import io.onedev.server.util.match.MatchScoreProvider;import io.onedev.server.util.match.MatchScoreUtils;@@ -15,16 +16,21 @@ public class UserChoiceProvider extends AbstractUserChoiceProvider {private static final long serialVersionUID = 1L;- private final List<User> choices;+ private final IModel<Collection<User>> choicesModel;- public UserChoiceProvider(List<User> choices) {- this.choices = new ArrayList<>(choices);- this.choices.sort(Comparator.comparing(User::getDisplayName));+ public UserChoiceProvider(IModel<Collection<User>> choicesModel) {+ this.choicesModel = choicesModel;}+ @Override+ public void detach() {+ choicesModel.detach();+ super.detach();+ }+@Overridepublic void query(String term, int page, Response<User> response) {- List<User> matched = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<User>() {+ List<User> matched = MatchScoreUtils.filterAndSort(choicesModel.getObject(), new MatchScoreProvider<User>() {@Overridepublic double getMatchScore(User object) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.javaindex 01caa4f2f8..17be711337 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java@@ -13,8 +13,8 @@ public class UserMultiChoice extends Select2MultiChoice<User> {private static final long serialVersionUID = 1L;- public UserMultiChoice(String id, IModel<Collection<User>> model, AbstractUserChoiceProvider choiceProvider) {- super(id, model, choiceProvider);+ public UserMultiChoice(String id, IModel<Collection<User>> selectionsModel, IModel<Collection<User>>choicesModel) {+ super(id, selectionsModel, new UserChoiceProvider(choicesModel));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.javaindex ff4e51f4dc..ef6c370dab 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.user.choice;+import java.util.Collection;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;@@ -10,8 +12,8 @@ import io.onedev.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")public class UserSingleChoice extends Select2Choice<User> {- public UserSingleChoice(String id, IModel<User> model, AbstractUserChoiceProvider choiceProvider) {- super(id, model, choiceProvider);+ public UserSingleChoice(String id, IModel<User> selectionModel, IModel<Collection<User>> choicesModel) {+ super(id, selectionModel, new UserChoiceProvider(choicesModel));}@Overridediff --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 a65f0b5351..b452451971 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@@ -98,14 +98,26 @@ public class BeanEditor extends ValueEditor<Serializable> {PropertyUpdating propertyUpdating = (PropertyUpdating) event.getPayload();for (Component groupContainer: groupsView) {RepeatingView propertiesView = (RepeatingView) groupContainer.get("content").get("properties");- for (Component item: propertiesView) {+ for (Component propertyContainer: propertiesView) {@SuppressWarnings("unchecked")- PropertyContext<Serializable> propertyContext = (PropertyContext<Serializable>) item.getDefaultModelObject();+ PropertyContext<Serializable> propertyContext =+ (PropertyContext<Serializable>) propertyContainer.getDefaultModelObject();Set<String> checkedPropertyNames = new HashSet<>();if (hasTransitiveDependency(propertyContext.getPropertyName(),propertyUpdating.getPropertyName(), checkedPropertyNames)) {- propertyUpdating.getHandler().add(item);- String script = String.format("$('#%s').addClass('no-autofocus');", item.getMarkupId());+ /*+ * Create new property container instead of simply refreshing it as some dependent+ * properties may only take effect when re-create the property container. For instance+ * If default value of an issue field depends on input value of another issue field+ */+ PropertyContainer newPropertyContainer =+ newPropertyContainer(propertyContainer.getId(), propertyContext);+ propertyContainer.replaceWith(newPropertyContainer);+ componentContexts.put(propertyContext.getPropertyName(),+ new ComponentContext(newPropertyContainer));+ propertyUpdating.getHandler().add(newPropertyContainer);+ String script = String.format("$('#%s').addClass('no-autofocus');",+ newPropertyContainer.getMarkupId());propertyUpdating.getHandler().appendJavaScript(script);}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.javanew file mode 100644index 0000000000..58ae461070--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.java@@ -0,0 +1,66 @@+package io.onedev.server.web.editable;++import java.lang.reflect.Method;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;++import io.onedev.server.web.behavior.JobMatchBehavior;+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;+import io.onedev.server.web.editable.annotation.JobMatch;+import io.onedev.server.web.editable.string.StringPropertyEditor;++@SuppressWarnings("serial")+public class JobMatchEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ Method propertyGetter = descriptor.getPropertyGetter();+ if (propertyGetter.getAnnotation(JobMatch.class) != null) {+ if (propertyGetter.getReturnType() != String.class) {+ throw new RuntimeException("Annotation 'JobMatch' should be applied to property "+ + "with type 'String'");+ }+ 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) {+ String jobMatch = model.getObject();+ if (jobMatch != null)+ return new Label(id, jobMatch);+ else+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }++ };+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new StringPropertyEditor(componentId, descriptor, model) {++ @Override+ protected InputAssistBehavior getInputAssistBehavior() {+ return new JobMatchBehavior();+ }++ };+ }++ };+ } else {+ return null;+ }+ }++ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/UserMatcherEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/UserMatchEditSupport.javasimilarity index 74%rename from server-core/src/main/java/io/onedev/server/web/editable/UserMatcherEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/UserMatchEditSupport.javaindex 150b8a5b82..1f8ef5e903 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/UserMatcherEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/UserMatchEditSupport.java@@ -4,21 +4,21 @@ import java.lang.reflect.Method;import org.apache.wicket.model.IModel;-import io.onedev.server.web.behavior.UserMatcherBehavior;+import io.onedev.server.web.behavior.UserMatchBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;-import io.onedev.server.web.editable.annotation.UserMatcher;+import io.onedev.server.web.editable.annotation.UserMatch;import io.onedev.server.web.editable.string.StringPropertyEditor;import io.onedev.server.web.editable.string.StringPropertyViewer;@SuppressWarnings("serial")-public class UserMatcherEditSupport implements EditSupport {+public class UserMatchEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {Method propertyGetter = descriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(UserMatcher.class) != null) {+ if (propertyGetter.getAnnotation(UserMatch.class) != null) {if (propertyGetter.getReturnType() != String.class) {- throw new RuntimeException("Annotation 'UserMatcher' should be applied to property "+ throw new RuntimeException("Annotation 'UserMatch' should be applied to property "+ "of type 'String'.");}return new PropertyContext<String>(descriptor) {@@ -34,7 +34,7 @@ public class UserMatcherEditSupport implements EditSupport {@Overrideprotected InputAssistBehavior getInputAssistBehavior() {- return new UserMatcherBehavior();+ return new UserMatchBehavior();}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.javaindex 4aa1c85020..583335ddb2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.java@@ -18,7 +18,7 @@ public @interface BuildQuery {boolean withUnfinishedCriteria();- boolean noAutoFocus() default true;+ boolean withOrder() default true;String message() default "";diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.javaindex 217840497d..b7902a9a81 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java@@ -18,6 +18,12 @@ public @interface IssueQuery {boolean withCurrentBuildCriteria();+ boolean withCurrentPullRequestCriteria();++ boolean withCurrentCommitCriteria();++ boolean withOrder() default true;+String message() default "";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/JobMatch.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/JobMatch.javanew file mode 100644index 0000000000..df1adc2184--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/JobMatch.java@@ -0,0 +1,24 @@+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.JobMatchValidator;++@Target(ElementType.METHOD)+@Retention(RetentionPolicy.RUNTIME)+@Constraint(validatedBy=JobMatchValidator.class)+public @interface JobMatch {++ String message() default "";++ Class<?>[] groups() default {};++ Class<? extends Payload>[] payload() default {};++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/UserMatcher.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/UserMatch.javasimilarity index 74%rename from server-core/src/main/java/io/onedev/server/web/editable/annotation/UserMatcher.javarename to server-core/src/main/java/io/onedev/server/web/editable/annotation/UserMatch.javaindex 504354f332..c3d148449b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/UserMatcher.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/UserMatch.java@@ -8,12 +8,13 @@ import java.lang.annotation.Target;import javax.validation.Constraint;import javax.validation.Payload;-import io.onedev.server.util.validation.UserMatcherValidator;+import io.onedev.server.util.validation.UserMatchValidator;@Target({ElementType.METHOD, ElementType.FIELD})@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=UserMatcherValidator.class)-public @interface UserMatcher {+@Constraint(validatedBy=UserMatchValidator.class)+public @interface UserMatch {+String message() default "";Class<?>[] groups() default {};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 52c4dddbc6..a783e4bc91 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@@ -2,21 +2,22 @@ package io.onedev.server.web.editable.branchchoice;import java.util.ArrayList;import java.util.Collection;+import java.util.LinkedHashMap;import java.util.List;+import java.util.Map;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;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 io.onedev.server.git.GitUtils;+import io.onedev.server.git.RefInfo;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.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {@@ -27,28 +28,27 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {super(id, propertyDescriptor, propertyModel);}- @SuppressWarnings({ "rawtypes", "unchecked" })@Overrideprotected void onInitialize() {super.onInitialize();- BranchChoiceProvider branchProvider = new BranchChoiceProvider(new LoadableDetachableModel<Project>() {-- @Override- protected Project load() {- if (getPage() instanceof ProjectPage)- return ((ProjectPage) getPage()).getProject();- else- return null;+ Map<String, String> choices = new LinkedHashMap<>();+ if (Project.get() != null) {+ for (RefInfo ref: Project.get().getBranchRefInfos()) {+ String branch = GitUtils.ref2branch(ref.getRef().getName());+ choices.put(branch, branch);}-- });+ }- ArrayList<String> projectAndBranches = new ArrayList<>();- if (getModelObject() != null)- projectAndBranches.addAll(getModelObject());+ Collection<String> selections = new ArrayList<>();+ if (getModelObject() != null) {+ for (String selection: getModelObject()) {+ if (choices.containsKey(selection))+ selections.add(selection);+ }+ }- input = new BranchMultiChoice("input", new Model(projectAndBranches), branchProvider) {+ input = new BranchMultiChoice("input", Model.of(selections), Model.ofMap(choices)) {@Overrideprotected void onInitialize() {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 bbcdcb583f..6900c289c3 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@@ -1,18 +1,20 @@package io.onedev.server.web.editable.branchchoice;+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.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import io.onedev.server.git.GitUtils;+import io.onedev.server.git.RefInfo;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.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class BranchSingleChoiceEditor extends PropertyEditor<String> {@@ -27,19 +29,19 @@ public class BranchSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- BranchChoiceProvider branchProvider = new BranchChoiceProvider(new LoadableDetachableModel<Project>() {-- @Override- protected Project load() {- if (getPage() instanceof ProjectPage)- return ((ProjectPage) getPage()).getProject();- else- return null;+ Map<String, String> choices = new LinkedHashMap<>();+ if (Project.get() != null) {+ for (RefInfo ref: Project.get().getBranchRefInfos()) {+ String branch = GitUtils.ref2branch(ref.getRef().getName());+ choices.put(branch, branch);}-- });+ }++ String selection = getModelObject();+ if (!choices.containsKey(selection))+ selection = null;- input = new BranchSingleChoice("input", getModel(), branchProvider) {+ input = new BranchSingleChoice("input", Model.of(selection), Model.ofMap(choices)) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.javaindex 80c5b0fd63..92267b5b9c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.java@@ -43,7 +43,7 @@ public class BuildQueryEditor extends PropertyEditor<String> {return null;}- }, buildQuery.withCurrentUserCriteria(), buildQuery.withUnfinishedCriteria()));+ }, buildQuery.withOrder(), buildQuery.withCurrentUserCriteria(), buildQuery.withUnfinishedCriteria()));input.setLabel(Model.of(getDescriptor().getDisplayName()));diff --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 91ba8b50fb..b1a7ba6cef 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@@ -67,21 +67,12 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {};- input = new StringMultiChoice("input", new LoadableDetachableModel<Collection<String>>() {-- @Override- protected Collection<String> load() {- List<String> selections;- if (getModelObject() != null) {- selections = MultiChoiceEditor.this.getModelObject();- selections.retainAll(choicesModel.getObject().keySet());- } else {- selections = new ArrayList<>();- }- return selections;- }-- }, choicesModel) {+ List<String> selections = getModelObject();+ if (selections != null)+ selections.retainAll(choicesModel.getObject().keySet());+ else+ selections = new ArrayList<>();+ input = new StringMultiChoice("input", Model.of(selections), choicesModel) {@Overrideprotected void onInitialize() {diff --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 c14babe650..ce654f7a3e 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@@ -64,18 +64,10 @@ public class SingleChoiceEditor extends PropertyEditor<String> {};- input = new StringSingleChoice("input", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- String selection = SingleChoiceEditor.this.getModelObject();- if (choicesModel.getObject().containsKey(selection))- return selection;- else- return null;- }-- }, choicesModel) {+ String selection = getModelObject();+ if (!choicesModel.getObject().containsKey(selection))+ selection = null;+ input = new StringSingleChoice("input", Model.of(selection), choicesModel) {@Overrideprotected void onInitialize() {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.htmlindex 76157e7260..7325d10171 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.html@@ -1,5 +1,5 @@<wicket:panel><div wicket:id="container" class="code-support">- <textarea wicket:id="input"></textarea>+ <textarea wicket:id="input" class="no-autosize deletion-aware"></textarea></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.htmlindex 6182108253..5a2709ac78 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.html@@ -1,5 +1,5 @@<wicket:panel><div class="code-support">- <textarea wicket:id="input"></textarea>+ <textarea wicket:id="input" class="no-autosize"></textarea></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.jsindex d04b1b2000..b5550a9d06 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js@@ -44,6 +44,10 @@ onedev.server.codeSupport = {}});+ $input.on("beforeDelete", function() {+ cm.toTextArea();+ });+onedev.server.codeSupport.trackWidth(inputId);},showVariables: function(inputId, variables, line, start, end) {@@ -75,13 +79,14 @@ onedev.server.codeSupport = {onedev.server.codeSupport.trackWidth(inputId);},trackWidth: function(inputId) {- var $cm = $("#" + inputId).next();- var cm = $cm[0].CodeMirror;function setWidth() {- var $cm = $("#"+inputId).next();- cm.setSize(1, null); // shrink temporarily in order to get original parent width- cm.setSize($cm.parent().width(), null);- cm.refresh();+ var $cm = $("#" + inputId).next();+ if ($cm.length != 0) {+ var cm = $cm[0].CodeMirror;+ cm.setSize(1, null); // shrink temporarily in order to get original parent width+ cm.setSize($cm.parent().width(), null);+ cm.refresh();+ }}setWidth();$(window).resize(setWidth);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.js b/server-core/src/main/java/io/onedev/server/web/editable/editable.jsindex 55471aeed4..b9798673fe 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.js+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.js@@ -53,7 +53,7 @@ onedev.server.editable = {$group.hide();},};-$(document).on("elementReplaced", function(event, componentId) {+$(document).on("afterElementReplace", function(event, componentId) {var $component = $("#" + componentId);var $group = $component.closest(".bean-properties.group");if ($group.length != 0 && $group.children("a").length != 0)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 e31aea87a3..6b9531f222 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@@ -1,8 +1,8 @@package io.onedev.server.web.editable.groupchoice;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;+import java.util.Comparator;import java.util.List;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -17,7 +17,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.util.ReflectionUtils;-import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;import io.onedev.server.web.component.groupchoice.GroupMultiChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -26,20 +25,19 @@ import io.onedev.server.web.editable.annotation.GroupChoice;@SuppressWarnings("serial")public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {- private final List<Group> choices = new ArrayList<>();-private GroupMultiChoice input;public GroupMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Collection<String>> propertyModel) {super(id, propertyDescriptor, propertyModel);}- @SuppressWarnings({ "rawtypes", "unchecked" })+ @SuppressWarnings({ "unchecked" })@Overrideprotected void onInitialize() {super.onInitialize();++ List<Group> choices = new ArrayList<>();- List<Group> groups = new ArrayList<>();GroupChoice groupChoice = descriptor.getPropertyGetter().getAnnotation(GroupChoice.class);Preconditions.checkNotNull(groupChoice);if (groupChoice.value().length() != 0) {@@ -47,19 +45,20 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {.invokeStaticMethod(descriptor.getBeanClass(), groupChoice.value()));} else {choices.addAll(OneDev.getInstance(GroupManager.class).query());+ choices.sort(Comparator.comparing(Group::getName));}- groups = new ArrayList<>();+ List<Group> selections = new ArrayList<>();if (getModelObject() != null) {GroupManager groupManager = OneDev.getInstance(GroupManager.class);for (String groupName: getModelObject()) {Group group = groupManager.find(groupName);if (group != null && choices.contains(group))- groups.add(group);+ selections.add(group);}}- input = new GroupMultiChoice("input", new Model((Serializable)groups), new GroupChoiceProvider(choices)) {+ input = new GroupMultiChoice("input", Model.of(selections), Model.of(choices)) {@Overrideprotected void onInitialize() {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 ab089e7fa9..9541968e4c 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@@ -1,6 +1,7 @@package io.onedev.server.web.editable.groupchoice;import java.util.ArrayList;+import java.util.Comparator;import java.util.List;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -15,7 +16,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.util.ReflectionUtils;-import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;import io.onedev.server.web.component.groupchoice.GroupSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -24,8 +24,6 @@ import io.onedev.server.web.editable.annotation.GroupChoice;@SuppressWarnings("serial")public class GroupSingleChoiceEditor extends PropertyEditor<String> {- private final List<Group> choices = new ArrayList<>();-private GroupSingleChoice input;public GroupSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {@@ -37,6 +35,8 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();+ List<Group> choices = new ArrayList<>();+GroupChoice groupChoice = descriptor.getPropertyGetter().getAnnotation(GroupChoice.class);Preconditions.checkNotNull(groupChoice);if (groupChoice.value().length() != 0) {@@ -44,6 +44,7 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {.invokeStaticMethod(descriptor.getBeanClass(), groupChoice.value()));} else {choices.addAll(OneDev.getInstance(GroupManager.class).query());+ choices.sort(Comparator.comparing(Group::getName));}Group group;@@ -55,7 +56,7 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {if (group != null && !choices.contains(group))group = null;- input = new GroupSingleChoice("input", Model.of(group), new GroupChoiceProvider(choices)) {+ input = new GroupSingleChoice("input", Model.of(group), Model.of(choices)) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.javaindex f9aa2ea9ed..baa8599c19 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.java@@ -43,7 +43,8 @@ public class IssueQueryEditor extends PropertyEditor<String> {return null;}- }, issueQuery.withCurrentUserCriteria(), issueQuery.withCurrentBuildCriteria()));+ }, issueQuery.withOrder(), issueQuery.withCurrentUserCriteria(), issueQuery.withCurrentBuildCriteria(),+ issueQuery.withCurrentPullRequestCriteria(), issueQuery.withCurrentCommitCriteria()));input.setLabel(Model.of(getDescriptor().getDisplayName()));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 750b7e0e34..c4866b8ced 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@@ -2,12 +2,15 @@ package io.onedev.server.web.editable.job.choice;import java.util.ArrayList;import java.util.Collection;+import java.util.LinkedHashMap;import java.util.List;+import java.util.Map;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import io.onedev.server.model.Project;import io.onedev.server.web.component.job.JobMultiChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -26,13 +29,19 @@ public class JobMultiChoiceEditor extends PropertyEditor<List<String>> {protected void onInitialize() {super.onInitialize();- List<String> jobNames;- if (getModelObject() != null)- jobNames = getModelObject();- else- jobNames = new ArrayList<>();+ Map<String, String> choices = new LinkedHashMap<>();+ for (String jobName: Project.get().getJobNames())+ choices.put(jobName, jobName);++ List<String> selections = new ArrayList<>();+ if (getModelObject() != null) {+ for (String selection: getModelObject()) {+ if (choices.containsKey(selection))+ selections.add(selection);+ }+ }- input = new JobMultiChoice("input", Model.of(jobNames));+ input = new JobMultiChoice("input", Model.of(selections), Model.ofMap(choices));input.setConvertEmptyInputStringToNull(true);input.setLabel(Model.of(getDescriptor().getDisplayName()));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 fce4703abd..1ddaa13a26 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@@ -1,9 +1,13 @@package io.onedev.server.web.editable.job.choice;+import java.util.LinkedHashMap;+import java.util.Map;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import io.onedev.server.model.Project;import io.onedev.server.web.component.job.JobSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -13,8 +17,7 @@ public class JobSingleChoiceEditor extends PropertyEditor<String> {private JobSingleChoice input;- public JobSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,- IModel<String> propertyModel) {+ public JobSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {super(id, propertyDescriptor, propertyModel);}@@ -22,7 +25,15 @@ public class JobSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- input = new JobSingleChoice("input", Model.of(getModelObject()));+ Map<String, String> choices = new LinkedHashMap<>();+ for (String jobName: Project.get().getJobNames())+ choices.put(jobName, jobName);++ String selection = getModelObject();+ if (!choices.containsKey(selection))+ selection = null;++ input = new JobSingleChoice("input", Model.of(selection), Model.ofMap(choices));input.setConvertEmptyInputStringToNull(true);input.setLabel(Model.of(getDescriptor().getDisplayName()));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.javaindex a13bc870b6..eb49d2c4d4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java@@ -1,6 +1,5 @@package io.onedev.server.web.editable.project.choice;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -31,24 +30,23 @@ public class ProjectMultiChoiceEditor extends PropertyEditor<List<String>> {super(id, propertyDescriptor, propertyModel);}- @SuppressWarnings({ "rawtypes", "unchecked" })@Overrideprotected void onInitialize() {super.onInitialize();choices.addAll(OneDev.getInstance(ProjectManager.class).query());- List<Project> projects = new ArrayList<>();+ List<Project> selections = new ArrayList<>();if (getModelObject() != null) {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);for (String projectName: getModelObject()) {Project project = projectManager.find(projectName);if (project != null && choices.contains(project))- projects.add(project);+ selections.add(project);}}- input = new ProjectMultiChoice("input", new Model((Serializable)projects), new ProjectChoiceProvider(choices)) {+ input = new ProjectMultiChoice("input", Model.of(selections), new ProjectChoiceProvider(choices)) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.javaindex 264b171b11..9d98677f08 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java@@ -41,13 +41,13 @@ public class ProjectSingleChoiceEditor extends PropertyEditor<String> {elseproject = null;- Project facade;+ Project selection;if (project != null && choices.contains(project))- facade = project;+ selection = project;else- facade = null;+ selection = null;- input = new ProjectSingleChoice("input", Model.of(facade), new ProjectChoiceProvider(choices)) {+ input = new ProjectSingleChoice("input", Model.of(selection), new ProjectChoiceProvider(choices)) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.javaindex 26fa4bb50f..7fd2797b60 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java@@ -37,13 +37,13 @@ public class RoleMultiChoiceEditor extends PropertyEditor<List<String>> {for (Role role: OneDev.getInstance(RoleManager.class).query())roleNames.put(role.getName(), role.getName());- Collection<String> selected = new ArrayList<>();+ Collection<String> selections = new ArrayList<>();if (getModelObject() != null)- selected.addAll(getModelObject());+ selections.addAll(getModelObject());- selected.retainAll(roleNames.keySet());+ selections.retainAll(roleNames.keySet());- input = new StringMultiChoice("input", Model.of(selected), Model.ofMap(roleNames)) {+ input = new StringMultiChoice("input", Model.of(selections), Model.ofMap(roleNames)) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.javaindex b0982ba437..bdaf3f6df5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java@@ -34,11 +34,11 @@ public class RoleSingleChoiceEditor extends PropertyEditor<String> {for (Role role: OneDev.getInstance(RoleManager.class).query())roleNames.put(role.getName(), role.getName());- String selected = getModelObject();- if (!roleNames.containsKey(selected))- selected = null;+ String selection = getModelObject();+ if (!roleNames.containsKey(selection))+ selection = null;- input = new StringSingleChoice("input", Model.of(selected), Model.ofMap(roleNames)) {+ input = new StringSingleChoice("input", Model.of(selection), Model.ofMap(roleNames)) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.javaindex 60d6377ebb..2aeedf49d1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java@@ -56,18 +56,11 @@ public class ScriptChoiceEditor extends PropertyEditor<String> {};- 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) {+ String selection = getModelObject();+ if (!choicesModel.getObject().containsKey(selection))+ selection = null;++ input = new StringSingleChoice("input", Model.of(selection), choicesModel) {@Overrideprotected void onInitialize() {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 4316ec2823..0c56d6535e 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@@ -1,8 +1,8 @@package io.onedev.server.web.editable.userchoice;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;+import java.util.Comparator;import java.util.List;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -18,7 +18,6 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.ReflectionUtils;-import io.onedev.server.web.component.user.choice.UserChoiceProvider;import io.onedev.server.web.component.user.choice.UserMultiChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -27,8 +26,6 @@ import io.onedev.server.web.editable.annotation.UserChoice;@SuppressWarnings("serial")public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {- private final List<User> choices = new ArrayList<>();-private UserMultiChoice input;public UserMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,@@ -36,13 +33,14 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {super(id, propertyDescriptor, propertyModel);}- @SuppressWarnings({ "rawtypes", "unchecked" })+ @SuppressWarnings({"unchecked" })@Overrideprotected void onInitialize() {super.onInitialize();++ List<User> choices = new ArrayList<>();ComponentContext componentContext = new ComponentContext(this);-ComponentContext.push(componentContext);try {UserChoice userChoice = descriptor.getPropertyGetter().getAnnotation(UserChoice.class);@@ -52,22 +50,23 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {.invokeStaticMethod(descriptor.getBeanClass(), userChoice.value()));} else {choices.addAll(OneDev.getInstance(UserManager.class).query());+ choices.sort(Comparator.comparing(User::getName));}} finally {ComponentContext.pop();}- List<User> users = new ArrayList<>();+ List<User> selections = new ArrayList<>();if (getModelObject() != null) {UserManager userManager = OneDev.getInstance(UserManager.class);for (String userName: getModelObject()) {User user = userManager.findByName(userName);if (user != null && choices.contains(user))- users.add(user);+ selections.add(user);}}- input = new UserMultiChoice("input", new Model((Serializable)users), new UserChoiceProvider(choices)) {+ input = new UserMultiChoice("input", Model.of(selections), Model.of(choices)) {@Overrideprotected void onInitialize() {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 89807b4a40..b38044d529 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@@ -1,6 +1,7 @@package io.onedev.server.web.editable.userchoice;import java.util.ArrayList;+import java.util.Comparator;import java.util.List;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -16,7 +17,6 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.ReflectionUtils;-import io.onedev.server.web.component.user.choice.UserChoiceProvider;import io.onedev.server.web.component.user.choice.UserSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -25,8 +25,6 @@ import io.onedev.server.web.editable.annotation.UserChoice;@SuppressWarnings("serial")public class UserSingleChoiceEditor extends PropertyEditor<String> {- private final List<User> choices = new ArrayList<>();-private UserSingleChoice input;public UserSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,@@ -39,8 +37,9 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- ComponentContext componentContext = new ComponentContext(this);+ List<User> choices = new ArrayList<>();+ ComponentContext componentContext = new ComponentContext(this);ComponentContext.push(componentContext);try {UserChoice userChoice = descriptor.getPropertyGetter().getAnnotation(UserChoice.class);@@ -50,21 +49,22 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {.invokeStaticMethod(descriptor.getBeanClass(), userChoice.value()));} else {choices.addAll(OneDev.getInstance(UserManager.class).query());+ choices.sort(Comparator.comparing(User::getName));}} finally {ComponentContext.pop();}- User user;+ User selection;if (getModelObject() != null)- user = OneDev.getInstance(UserManager.class).findByName(getModelObject());+ selection = OneDev.getInstance(UserManager.class).findByName(getModelObject());else- user = null;+ selection = null;- if (user != null && !choices.contains(user))- user = null;+ if (selection != null && !choices.contains(selection))+ selection = null;- input = new UserSingleChoice("input", Model.of(user), new UserChoiceProvider(choices)) {+ input = new UserSingleChoice("input", Model.of(selection), Model.of(choices)) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css b/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.cssindex 1a32b51719..eda1be8ee8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/group.css@@ -17,7 +17,7 @@padding-bottom: 10000px;}#group>.sidebar>.head {- border-bottom: 2px solid #E0E0E0;+ border-bottom: 4px solid #EEE;font-size: 16px;white-space: nowrap;overflow: hidden;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 9d166cb234..130899da76 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@@ -17,6 +17,7 @@ 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.RoleManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.issue.fieldspec.ChoiceField;import io.onedev.server.issue.fieldspec.FieldSpec;@@ -107,6 +108,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {displayInList = getSetting().getListFields().remove(oldField.getName());if (!field.getName().equals(oldField.getName())) {getSetting().onRenameField(oldField.getName(), field.getName());+ OneDev.getInstance(RoleManager.class).onRenameIssueField(oldField.getName(), field.getName());getSetting().setReconciled(false);}if (oldField instanceof ChoiceField && field instanceof ChoiceField) {@@ -142,7 +144,8 @@ abstract class FieldEditPanel extends Panel implements InputContext {getSetting().setReconciled(false);}if (!valueRenames.isEmpty() || !valueDeletions.isEmpty()) {- getSetting().onEditFieldValues(field.getName(), new ValueSetEdit(valueRenames, valueDeletions));+ getSetting().onEditFieldValues(null, field.getName(),+ new ValueSetEdit(valueRenames, valueDeletions));}}}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 d57351154d..2e7f11758f 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@@ -31,6 +31,7 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.administration.GlobalIssueSetting;@@ -296,6 +297,7 @@ public class IssueFieldListPage extends IssueSettingPage {getSetting().getDefaultPromptFieldsUponIssueOpen().remove(field.getName());getSetting().getListFields().remove(field.getName());getSetting().onDeleteField(field.getName());+ OneDev.getInstance(RoleManager.class).onDeleteIssueField(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/user/user.css b/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.cssindex a3a092d725..d0467a8082 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/user.css@@ -21,7 +21,7 @@padding-bottom: 10000px;}#user>.sidebar>.head {- border-bottom: 2px solid #E0E0E0;+ border-bottom: 4px solid #EEE;padding: 10px;font-size: 16px;white-space: nowrap;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 9de338470e..a45f094d88 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@@ -2,13 +2,15 @@ body {font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";background: white;}-a {color: #1f3b7b;}a.embedded-reference {color: #0d87e9;}+.head .actions a {+ color: #333;+}.pointer {cursor: pointer;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.jsindex 26830144f1..817729e3ac 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js@@ -130,7 +130,7 @@ onedev.server = {});},dirtyChanged: function($form) {- $dirtyAware = $form.find(".dirty-aware");+ var $dirtyAware = $form.find(".dirty-aware");if ($dirtyAware.length != 0) {if ($form.hasClass("dirty")) {$dirtyAware.removeAttr("disabled");@@ -144,7 +144,7 @@ onedev.server = {onedev.server.form.trackDirty(this);});- $(document).on("elementReplaced", function(event, componentId) {+ $(document).on("afterElementReplace", function(event, componentId) {var $component = $("#" + componentId);$component.find("form").each(function() {onedev.server.form.trackDirty(this);@@ -219,12 +219,17 @@ onedev.server = {doAutosize($("textarea"));- $(document).on("elementReplaced", function(event, componentId) {- var $component = $("#" + componentId);- var $textarea = $component.find("textarea");- if ($component.is("textarea"))- $textarea = $textarea.add($component);- doAutosize($textarea);+ $(document).on("beforeElementReplace", function(event, componentId) {+ var $textarea = $("#" + componentId).find("textarea").addBack("textarea");+ $textarea.each(function() {+ if ($(this).closest(".no-autosize").length == 0) {+ autosize.destroy($(this));+ }+ });+ });++ $(document).on("afterElementReplace", function(event, componentId) {+ doAutosize($("#" + componentId).find("textarea").addBack("textarea"));});},@@ -301,7 +306,7 @@ onedev.server = {}if ($inError.length != 0) {var $focusable = $inError.find(focusibleSelector).addBack(focusibleSelector);- if ($focusable.hasClass("CodeMirror") && $this[0].CodeMirror.options.readOnly == false) {+ if ($focusable.hasClass("CodeMirror") && $focusable[0].CodeMirror.options.readOnly == false) {$focusable[0].CodeMirror.focus();} else if ($focusable.length != 0&& $focusable.closest(".select2-container").length == 0@@ -348,7 +353,7 @@ onedev.server = {onedev.server.focus.doFocus($(document));- $(document).on("elementReplaced", function(event, componentId) {+ $(document).on("afterElementReplace", function(event, componentId) {if (onedev.server.focus.$components != null)onedev.server.focus.$components = onedev.server.focus.$components.add("#" + componentId);});@@ -632,7 +637,7 @@ onedev.server = {}, 0);});}- $(document).on("elementReplaced", function(event, componentId) {+ $(document).on("afterElementReplace", function(event, componentId) {installListener($("#" + componentId));});installListener($(document));@@ -665,7 +670,7 @@ onedev.server = {}});}- $(document).on("elementReplaced", function(event, componentId) {+ $(document).on("afterElementReplace", function(event, componentId) {installClearer($("#" + componentId));});installClearer($(document));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 171ff00bb1..d3e7e821fe 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@@ -129,6 +129,10 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sprivate static final String PARAM_MODE = "mode";+ private static final String PARAM_VIEW_PLAIN = "view-plain";++ private static final String PARAM_EDIT_FROM_FOLDER = "edit-from-folder";+private static final String PARAM_QUERY = "query";private static final String PARAM_POSITION = "position";@@ -176,6 +180,12 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, SString modeStr = params.get(PARAM_MODE).toString();if (modeStr != null)state.mode = Mode.valueOf(modeStr.toUpperCase());++ String viewPlain = params.get(PARAM_VIEW_PLAIN).toString();+ state.viewPlain = "true".equals(viewPlain);++ String editFromFolder = params.get(PARAM_EDIT_FROM_FOLDER).toString();+ state.editFromFolder = "true".equals(editFromFolder);if (state.blobIdent.revision != null)resolvedRevision = getProject().getObjectId(state.blobIdent.revision, true);@@ -456,7 +466,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Ssuper.onConfigure();Project project = getProject();- if ((state.mode == Mode.VIEW || state.mode == Mode.VIEW_PLAIN || state.mode == Mode.BLAME)+ if ((state.mode == Mode.VIEW || state.mode == Mode.BLAME)&& isOnBranch() && state.blobIdent.isTree()&& SecurityUtils.canWriteCode(project)) {setVisible(true);@@ -892,6 +902,11 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sparams.add(PARAM_COMMENT, state.commentId);if (state.mode != Mode.VIEW)params.add(PARAM_MODE, state.mode.name().toLowerCase());+ if (state.mode == Mode.VIEW && state.viewPlain)+ params.add(PARAM_VIEW_PLAIN, true);+ if (state.mode == Mode.EDIT && state.editFromFolder)+ params.add(PARAM_EDIT_FROM_FOLDER, true);+if (state.query != null)params.add(PARAM_QUERY, state.query);if (state.initialNewPath != null)@@ -990,6 +1005,16 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sreturn state.mode;}+ @Override+ public boolean isViewPlain() {+ return state.viewPlain;+ }++ @Override+ public boolean isEditFromFolder() {+ return state.editFromFolder;+ }+@Overridepublic void onSelect(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable String position) {String prevPosition = state.position;@@ -1110,6 +1135,19 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Spublic Mode mode = Mode.VIEW;+ /*+ * Some blob can be rendered in a way for easier understanding, such as .onedev-buildspec,+ * In these cases, the VIEW_PLAIN mode enables to view plain text of the blob. Applicable+ * only when mode is VIEW+ */+ public boolean viewPlain;++ /*+ * Whether or not current editing is triggered from folder view, for instance, clicking+ * edit link of folder readme. Applicable only when mode is EDIT+ */+ public boolean editFromFolder;+public boolean renderSource;public String query;@@ -1128,6 +1166,14 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S@Overridepublic void onModeChange(AjaxRequestTarget target, Mode mode, @Nullable String newPath) {+ onModeChange(target, mode, false, false, newPath);+ }++ @Override+ public void onModeChange(AjaxRequestTarget target, Mode mode, boolean viewPlain,+ boolean editFromFolder, @Nullable String newPath) {+ state.viewPlain = viewPlain;+ state.editFromFolder = editFromFolder;state.initialNewPath = newPath;/*@@ -1137,7 +1183,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sif (mode != Mode.ADD || state.mode != Mode.ADD) {state.mode = mode;pushState(target);- if (state.mode == Mode.VIEW || state.mode == Mode.VIEW_PLAIN || state.mode == Mode.EDIT || state.mode == Mode.ADD) {+ if (state.mode == Mode.VIEW || state.mode == Mode.EDIT || state.mode == Mode.ADD) {newBlobNavigator(target);newBlobOperations(target);}@@ -1200,8 +1246,19 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S} catch (IOException e) {throw new RuntimeException(e);}- } else if (state.mode == Mode.ADD || state.mode == Mode.EDIT) {+ } else if (state.mode == Mode.ADD) {newBlobIdent = new BlobIdent(branch, getNewPath(), FileMode.REGULAR_FILE.getBits());+ } else if (state.mode == Mode.EDIT) {+ if (state.editFromFolder) {+ newBlobIdent = new BlobIdent(state.blobIdent);+ if (newBlobIdent.path.contains("/"))+ newBlobIdent.path = StringUtils.substringBeforeLast(newBlobIdent.path, "/");+ else+ newBlobIdent.path = null;+ newBlobIdent.mode = FileMode.TREE.getBits();+ } else {+ newBlobIdent = new BlobIdent(branch, getNewPath(), FileMode.REGULAR_FILE.getBits());+ }} else {// We've uploaded some filesnewBlobIdent = null;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.cssindex 07d008eead..d97e265ca4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css@@ -103,7 +103,8 @@ body.ProjectBlobPage.additionalWidth3 {}#project-blob>.build-support-note {padding: 8px;- border-bottom: 1px solid #DDD;+ border-top: 1px solid #68D056;+ border-bottom: 1px solid #68D056;background: #E5FBE5;color: #399529;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.jsindex 3da8fbd7fc..297f0fdd35 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js@@ -128,7 +128,7 @@ onedev.server.projectBlob = {// Scroll anchors into view (for instance the markdown headline)var element = document.getElementsByName(decodeURIComponent(location.hash.slice(1)))[0];if (element)- element.jumpIntoView();+ element.scrollIntoView();}}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.javaindex a31ce8c238..21800aedf5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java@@ -22,11 +22,6 @@ public interface BlobRenderContext extends Serializable {public enum Mode {VIEW,- /*- * Some blob can be rendered in a way for easier understanding, such as .onedev-buildspec,- * In these cases, the VIEW_PLAIN mode enables to view plain text of the blob- */- VIEW_PLAIN,BLAME,ADD,EDIT,@@ -69,6 +64,10 @@ public interface BlobRenderContext extends Serializable {Mode getMode();+ boolean isViewPlain();++ boolean isEditFromFolder();+boolean isOnBranch();void pushState(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable String position);@@ -79,6 +78,9 @@ public interface BlobRenderContext extends Serializable {void onModeChange(AjaxRequestTarget target, Mode mode, @Nullable String newPath);+ void onModeChange(AjaxRequestTarget target, Mode mode, boolean viewPlain,+ boolean editFromFolder, @Nullable String newPath);+void onCommitted(@Nullable AjaxRequestTarget target, RefUpdated refUpdated, @Nullable String position);void onCommentOpened(AjaxRequestTarget target, @Nullable CodeComment comment);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.javaindex ea0dde47f7..98874deec1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java@@ -19,7 +19,10 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.markup.html.form.HiddenField;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.PropertyModel;+import org.eclipse.jgit.lib.FileMode;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.git.BlobIdent;import io.onedev.server.util.Provider;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;@@ -72,7 +75,17 @@ public abstract class BlobEditPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- context.onModeChange(target, Mode.VIEW, null);+ if (context.getMode() == Mode.EDIT && context.isEditFromFolder()) {+ BlobIdent blobIdent = new BlobIdent(context.getBlobIdent());+ if (blobIdent.path.contains("/"))+ blobIdent.path = StringUtils.substringBeforeLast(blobIdent.path, "/");+ else+ blobIdent.path = null;+ blobIdent.mode = FileMode.TREE.getBits();+ context.onSelect(target, blobIdent, null);+ } else {+ context.onModeChange(target, Mode.VIEW, null);+ }}});@@ -108,8 +121,10 @@ public abstract class BlobEditPanel extends Panel {target.appendJavaScript(script);currentTab = tab;-++ target.prependJavaScript(String.format("onedev.server.blobEdit.recordFormFlags('%s');", form.getMarkupId()));target.add(form);+ target.appendJavaScript(String.format("onedev.server.blobEdit.restoreFormFlags('%s');", form.getMarkupId()));}@Override@@ -166,7 +181,7 @@ public abstract class BlobEditPanel extends Panel {protected String getPosition() {return BlobEditPanel.this.getPosition();}-+});add(recreateBehavior = new AbstractPostAjaxBehavior() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.jsindex 790505287f..d90c0541f1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js@@ -67,7 +67,7 @@ onedev.server.blobEdit = {},selectTab: function($tab) {- var $active = $tab.parent().find(".tab.active");+ var $active = $tab.parent().find(".tab.active");$active.removeClass("active");$tab.addClass("active");var $blobEdit = $tab.closest(".blob-edit");@@ -92,6 +92,22 @@ onedev.server.blobEdit = {if (!$tab.hasClass("save"))onedev.server.viewState.getFromHistoryAndSetToView();},+ recordFormFlags: function(formId) {+ var $form = $("#" + formId);+ if ($form.hasClass("dirty"))+ $form.parent().addClass("dirty");+ else+ $form.parent().removeClass("dirty");+ $form.parent().data("autosaveKey", $form.data("autosaveKey"));+ },+ restoreFormFlags: function(formId) {+ var $form = $("#" + formId);+ if ($form.parent().hasClass("dirty"))+ $form.addClass("dirty");+ else+ $form.removeClass("dirty");+ $form.data("autosaveKey", $form.parent().data("autosaveKey"));+ },onNameChanging: function(containerId, addingFile, recreateCallback) {var $body = $("#" + containerId + ">.blob-edit>.body");var contentModified = $body.find("form.dirty").length != 0;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.jsindex ca7e132313..cacb9e7816 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js@@ -28,7 +28,7 @@ onedev.server.plainEdit = {* mark it as dirty explicitly. So we use no-dirtytrack class to* disable automatic dirty track*/- $plainEdit.closest("form").find("textarea").addClass("no-dirtytrack");+ $plainEdit.closest("form").find("textarea").addClass("no-dirtytrack").addClass("no-autosize");cm.on("change", function() {$plainEdit.closest("form").addClass("dirty");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.javaindex c65ed262ff..7efa043adb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java@@ -4,8 +4,8 @@ import org.apache.wicket.Component;import io.onedev.server.web.PrioritizedComponentRenderer;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;-import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;+import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;import io.onedev.server.web.page.project.blob.render.commitoption.CommitOptionPanel;public class BlobDeletionProvider implements BlobRendererContribution {@@ -30,7 +30,7 @@ public class BlobDeletionProvider implements BlobRendererContribution {protected String getPosition() {return null;}-+};}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.javaindex a7f31cdd37..3b252deb9c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java@@ -57,7 +57,7 @@ public class BuildSpecRendererProvider implements BlobRendererContribution {return 0;}};- } else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.VIEW_PLAIN || context.getMode() == Mode.BLAME)+ } else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)&& context.getBlobIdent().isFile()&& isBuildSpec(context.getBlobIdent().path)) {return new PrioritizedComponentRenderer() {@@ -68,7 +68,7 @@ public class BuildSpecRendererProvider implements BlobRendererContribution {public Component render(String componentId) {if (SourceRendererProvider.getRange(context.getPosition()) != null || context.getMode() == Mode.BLAME)return new SourceViewPanel(componentId, context, false);- else if (context.getMode() == Mode.VIEW_PLAIN)+ else if (context.isViewPlain())return new SourceViewPanel(componentId, context, true);elsereturn new BuildSpecBlobViewPanel(componentId, context);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.jsindex 09f1002971..234115bf63 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js@@ -139,7 +139,9 @@ onedev.server.buildSpec = {var index = $nav.index();var $nav = $navs.children().eq(index);$nav.remove();- $contents.children().eq(index).remove();+ var $content = $contents.children().eq(index);+ $content.find(".deletion-aware").trigger("beforeDelete");+ $content.remove();if ($nav.hasClass("active"))onedev.server.buildSpec.showJob(0);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.htmlindex 07c695e7b2..f5e7bd8598 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html@@ -17,7 +17,10 @@</table><div wicket:id="readme" class="readme"><div class="head">- <span wicket:id="title"></span>+ <span wicket:id="title" class="title"></span>+ <span class="actions">+ <a wicket:id="edit"><i class="fa fa-pencil"></i></a>+ </span></div><div wicket:id="body" class="body"></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.javaindex 8eebf8dff3..38c2fab373 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java@@ -40,12 +40,14 @@ import com.google.common.base.Preconditions;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.user.card.PersonCardPanel;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;@SuppressWarnings("serial")public class FolderViewPanel extends Panel {@@ -249,7 +251,26 @@ public class FolderViewPanel extends Panel {}}));-+ readmeContainer.add(new AjaxLink<Void>("edit") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ ProjectBlobPage.State state = new ProjectBlobPage.State();+ state.blobIdent = readmeModel.getObject();+ state.mode = Mode.EDIT;+ state.editFromFolder = true;+ setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(context.getProject(), state));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ BlobIdent blobIdent = readmeModel.getObject();+ setVisible(context.isOnBranch()+ && SecurityUtils.canModify(context.getProject(), blobIdent.revision, blobIdent.path));+ }++ });readmeContainer.add(new MarkdownViewer("body", new LoadableDetachableModel<String>() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.cssindex 0bdcad0c25..9181e5f070 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css@@ -33,14 +33,15 @@.folder-view>table tr.parent td a span {font-size: 18px;}-.folder-view>.readme {- border-top: 1px solid #E0E0E0;-}.folder-view>.readme>.head {padding: 6px 12px;- background: #F2F2F2;+ background: #F9F9F9;font-weight: bold;- border-bottom: 1px solid #E0E0E0;+ border-top: 1px solid #E0E0E0;+ border-bottom: 1px solid #EEE;+}+.folder-view>.readme>.head>.title {+ margin-right: 4px;}.folder-view>.readme>.body {padding: 20px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.jsindex 04f22ccbc5..2a27bbafe3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js@@ -31,7 +31,7 @@ onedev.server.sourceEdit = {* mark it as dirty explicitly. So we use no-dirtytrack class to* disable automatic dirty track*/- $sourceEdit.closest("form").find("textarea").addClass("no-dirtytrack");+ $sourceEdit.closest("form").find("textarea").addClass("no-dirtytrack").addClass("no-autosize");if (mark)onedev.server.codemirror.mark(cm, mark);@@ -46,9 +46,11 @@ onedev.server.sourceEdit = {if (doneTimer)clearTimeout(doneTimer);doneTimer = setTimeout(function() {+ var cm = onedev.server.sourceEdit.getCodeMirror(containerId);var content = cm.doc.getValue();if (content.trim().length != 0)localStorage.setItem(autosaveKey, content);+ cm = null;}, 500);});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.jsindex d2375148be..ab20eaf791 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js@@ -52,23 +52,7 @@ onedev.server.sourceView = {onedev.server.sourceView.highlightCommentTrigger();onedev.server.codemirror.bindShortcuts(cm);-- if (!($(document).data("SourceViewShortcutsBinded"))) {- $(document).data("SourceViewShortcutsBinded", true);-- /*- * Do not use hotkey plugin here as otherwise codemirror search will not function- * properly in readonly mode- */- $(document).on("keydown", function(e) {- if ($(".modal:visible").length == 0 && !onedev.server.util.canInput(e.target)- && e.keyCode == 79) {- var $sourceView = $(".source-view");- if ($sourceView.length != 0 && $(".outline-toggle").length != 0)- $sourceView.data("callback")("outlineSearch");- }- });- }+ onedev.server.sourceView.checkShortcutsBinding();$code.selectionPopover("init", function(e) {if ($(e.target).closest(".selection-popover").length != 0)@@ -83,7 +67,7 @@ onedev.server.sourceView = {}});- $code.find("textarea").addClass("readonly");+ $code.find("textarea").addClass("readonly").addClass("no-autosize");$code.mouseover(function(e) {var node = e.target || e.srcElement, $node = $(node);@@ -106,10 +90,12 @@ onedev.server.sourceView = {if (cursorActivityTimer)clearTimeout(cursorActivityTimer);cursorActivityTimer = setTimeout(function() {- var $outline = $sourceView.children(".outline");+ var $outline = $(".source-view>.outline");if ($outline.is(":visible")) {+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;var cursor = cm.getCursor();callback("syncOutline", cursor.line, cursor.ch);+ cm = null;}}, 500);});@@ -182,6 +168,24 @@ onedev.server.sourceView = {});}},+ checkShortcutsBinding() {+ if (!($(document).data("SourceViewShortcutsBinded"))) {+ $(document).data("SourceViewShortcutsBinded", true);++ /*+ * Do not use hotkey plugin here as otherwise codemirror search will not function+ * properly in readonly mode+ */+ $(document).on("keydown", function(e) {+ if ($(".modal:visible").length == 0 && !onedev.server.util.canInput(e.target)+ && e.keyCode == 79) {+ var $sourceView = $(".source-view");+ if ($sourceView.length != 0 && $(".outline-toggle").length != 0)+ $sourceView.data("callback")("outlineSearch");+ }+ });+ }+ },onWindowLoad: function(mark) {if (mark && onedev.server.viewState.getFromHistory() === undefined&& onedev.server.viewState.carryOver === undefined) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.javaindex 06538ca500..fc1556dfe7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -212,7 +212,7 @@ public abstract class BlobViewPanel extends Panel {add(new ResourceLink<Void>("raw", new RawBlobDownloadResourceReference(),RawBlobDownloadResource.paramsOf(context.getProject(), context.getBlobIdent())));- add(new CheckBox("viewPlain", Model.of(context.getMode() == Mode.VIEW_PLAIN)) {+ add(new CheckBox("viewPlain", Model.of(context.getMode() == Mode.VIEW && context.isViewPlain())) {@Overrideprotected void onConfigure() {@@ -232,10 +232,7 @@ public abstract class BlobViewPanel extends Panel {@Overrideprotected void onUpdate(AjaxRequestTarget target) {- if (context.getMode() == Mode.VIEW)- context.onModeChange(target, Mode.VIEW_PLAIN, null);- else- context.onModeChange(target, Mode.VIEW, null);+ context.onModeChange(target, Mode.VIEW, !context.isViewPlain(), false, null);}}));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 451b93c635..231abf5576 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -7,6 +7,7 @@ import java.util.Collections;import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;+import java.util.LinkedHashMap;import java.util.List;import java.util.Locale;import java.util.Map;@@ -73,7 +74,6 @@ import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.query.PullRequestQueryConstants;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.branch.choice.BranchChoiceProvider;import io.onedev.server.web.component.branch.choice.BranchSingleChoice;import io.onedev.server.web.component.commit.status.CommitStatusPanel;import io.onedev.server.web.component.contributorpanel.ContributorPanel;@@ -108,7 +108,7 @@ public class ProjectBranchesPage extends ProjectPage {@Overrideprotected List<RefInfo> load() {- List<RefInfo> refs = getProject().getBranches();+ List<RefInfo> refs = getProject().getBranchRefInfos();if (query != null) {for (Iterator<RefInfo> it = refs.iterator(); it.hasNext();) {String branch = GitUtils.ref2branch(it.next().getRef().getName());@@ -302,7 +302,19 @@ public class ProjectBranchesPage extends ProjectPage {baseBranch = object;}- }, new BranchChoiceProvider(projectModel)));+ }, new LoadableDetachableModel<Map<String, String>>() {++ @Override+ protected Map<String, String> load() {+ Map<String, String> branches = new LinkedHashMap<>();+ for (RefInfo ref: getProject().getBranchRefInfos()) {+ String branch = GitUtils.ref2branch(ref.getRef().getName());+ branches.put(branch, branch);+ }+ return branches;+ }++ }));baseChoice.setRequired(true);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 e015e0adbd..431d06d7f5 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@@ -16,8 +16,6 @@ import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.event.Broadcast;-import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -50,8 +48,7 @@ import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.component.build.side.BuildSidePanel;import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.component.modal.confirm.ConfirmModal;-import io.onedev.server.web.component.sideinfo.SideInfoClosed;-import io.onedev.server.web.component.sideinfo.SideInfoOpened;+import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;@@ -265,26 +262,7 @@ public abstract class BuildDetailPage extends ProjectPage}.add(new ConfirmOnClick("Do you really want to cancel this build?")));- summary.add(new AjaxLink<Void>("moreInfo") {-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (event.getPayload() instanceof SideInfoClosed) {- SideInfoClosed moreInfoSideClosed = (SideInfoClosed) event.getPayload();- setVisible(true);- moreInfoSideClosed.getHandler().add(this);- }- }-- @Override- public void onClick(AjaxRequestTarget target) {- setVisible(false);- target.add(this);- send(getPage(), Broadcast.BREADTH, new SideInfoOpened(target));- }-- }.setOutputMarkupPlaceholderTag(true));+ summary.add(new SideInfoLink("moreInfo"));add(new Label("errorMessage", new AbstractReadOnlyModel<String>() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.htmlindex d5ee236cc9..8b8bde11d4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="changes"><div wicket:id="commits"></div>- <div class="help-block"><i class="fa fa-info-circle"></i> This page lists changes since previous build on <a href="https://code.onedev.io/projects/onedev-manual/blob/master/pages/build-stream.md" target="_blank">same stream</a></div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists changes since previous build on <a href="https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#build-stream" target="_blank">same stream</a></div></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.htmlindex 30bcc47493..1ab14afaeb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="issues"><div wicket:id="issues"></div>- <div class="help-block"><i class="fa fa-info-circle"></i> This page lists fixed issues since previous build on <a href="https://code.onedev.io/projects/onedev-manual/blob/master/pages/build-stream.md" target="_blank">same stream</a></div>+ <div class="help-block"><i class="fa fa-info-circle"></i> This page lists fixed issues since previous build on <a href="https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#build-stream" target="_blank">same stream</a></div></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.javaindex 131f5c60b3..9ad01fef52 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java@@ -9,7 +9,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.issue.FixedInCriteria;+import io.onedev.server.search.entity.issue.FixedInBuildCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.web.component.issue.list.IssueListPanel;import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;@@ -38,7 +38,7 @@ public class FixedIssuesPage extends BuildDetailPage {@Overrideprotected IssueQuery getBaseQuery() {- return new IssueQuery(new FixedInCriteria(getBuild()), new ArrayList<>());+ return new IssueQuery(new FixedInBuildCriteria(getBuild()), new ArrayList<>());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex bdac92b481..b277526384 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -196,8 +196,8 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {descendants.add(getCommit().getId());List<RefInfo> refs = new ArrayList<>();- refs.addAll(getProject().getBranches());- refs.addAll(getProject().getTags());+ refs.addAll(getProject().getBranchRefInfos());+ refs.addAll(getProject().getTagRefInfos());return refs.stream().filter(ref->descendants.contains(ref.getPeeledObj())).collect(Collectors.toList());}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.javaindex bc14976c21..fdcd336cf1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java@@ -19,7 +19,9 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.Project;import io.onedev.server.search.entity.project.ProjectQuery;+import io.onedev.server.search.entity.project.ProjectQueryLexer;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.markdown.MarkdownViewer;@@ -70,7 +72,8 @@ public abstract class ProjectInfoPanel extends Panel {}.setVisible(SecurityUtils.canCreateProjects() && SecurityUtils.canReadCode(getProject())));- String query = "forks of " + ProjectQuery.quote(getProject().getName());+ String query = ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " "+ + Criteria.quote(getProject().getName());PageParameters params = ProjectListPage.paramsOf(query, 0, getProject().getForks().size());Link<Void> forksLink = new BookmarkablePageLink<Void>("forks", ProjectListPage.class, params) {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 58cc346149..96ac1ec2a5 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@@ -33,6 +33,7 @@ import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.user.avatar.UserAvatar;+import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QueryPositionSupport;@@ -78,7 +79,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {if (!fieldName.equals(IssueQueryConstants.FIELD_STATE)) {Input field = getIssue().getFieldInputs().get(fieldName);if (field != null && !field.getType().equals(FieldSpec.USER) && !field.getValues().isEmpty()) {- fieldsView.add(new FieldValuesPanel(fieldsView.newChildId()) {+ fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR) {@Overrideprotected Issue getIssue() {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 7eabc3b288..e6d769a9b6 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@@ -159,10 +159,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (identifyField.equals(IssueQueryConstants.FIELD_STATE)) {issue = SerializationUtils.clone(issue);for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {- if (transition.canTransite(issue)- && transition.getTrigger() instanceof PressButtonTrigger- && ((PressButtonTrigger)transition.getTrigger()).isAuthorized(getProject())- && transition.getToState().equals(getColumn())) {+ if (transition.canTransitManually(issue, getColumn())) {issue.setState(getColumn());break;}@@ -347,10 +344,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {ProjectIssueSetting workflow = getProject().getIssueSetting();AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {- if (transition.canTransite(issue)- && transition.getTrigger() instanceof PressButtonTrigger- && ((PressButtonTrigger)transition.getTrigger()).isAuthorized(getProject())- && transition.getToState().equals(getColumn())) {+ if (transition.canTransitManually(issue, getColumn())) {transitionRef.set(transition);break;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex f8ac2e8966..e3973dcc2f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -113,7 +113,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {private IssueQuery parse(boolean backlog, @Nullable String baseQueryString, @Nullable String additionalQueryString) {IssueQuery additionalQuery;try {- additionalQuery = IssueQuery.parse(getProject(), additionalQueryString, true, true, false);+ additionalQuery = IssueQuery.parse(getProject(), additionalQueryString, true, true, false, false, false);} catch (Exception e) {String prefix;if (backlog)@@ -127,7 +127,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {IssueQuery baseQuery;try {- baseQuery = IssueQuery.parse(getProject(), baseQueryString, true, true, false);+ baseQuery = IssueQuery.parse(getProject(), baseQueryString, true, true, false, false, false);} catch (Exception e) {String prefix;if (backlog)@@ -597,7 +597,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {elsemodel = Model.of(query);TextField<String> input = new TextField<String>("input", model);- input.add(new IssueQueryBehavior(projectModel, true, false));+ input.add(new IssueQueryBehavior(projectModel, true, true, false, false, false));if (backlog)input.add(AttributeAppender.append("placeholder", "Filter backlog issues"));elsediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.cssindex 16d877cb60..782cd835e5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css@@ -131,12 +131,14 @@#issue-boards>.body .card .head>* {margin: 0 8px 8px 0;}+#issue-boards>.body .card .head .issue-state {+ font-size: 11px;+}#issue-boards>.body .card .head .field-values .value span {background: #EEE;padding: .2em .6em .3em;border-radius: .25em;- font-size: 75%;- font-weight: bold;+ font-size: 11px;line-height: 1;white-space: nowrap;vertical-align: baseline;@@ -176,7 +178,7 @@color: #666;text-decoration: none;font-size: 14px;- margin-top: -2px;+ line-height: 18px;}.board-card-detail>.modal-header {padding-right: 30px;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 3d5368b569..8d3ed924a7 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@@ -49,7 +49,7 @@ public class NewIssuePage extends ProjectPage implements InputContext, ScriptIde@Overrideprotected IssueCriteria load() {try {- IssueQuery query = IssueQuery.parse(getProject(), queryString, true, true, false);+ IssueQuery query = IssueQuery.parse(getProject(), queryString, true, true, false, false, false);return query.getCriteria();} catch (Exception e) {return null;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 14ef3dfd4f..4913e5f3f2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -123,7 +123,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {private String suggestSourceBranch() {User user = getLoginUser();List<Pair<String, Integer>> branchUpdates = new ArrayList<>();- for (RefInfo refInfo: getProject().getBranches()) {+ for (RefInfo refInfo: getProject().getBranchRefInfos()) {RevCommit commit = (RevCommit) refInfo.getPeeledObj();if (commit.getAuthorIdent().getEmailAddress().equals(user.getEmail()))branchUpdates.add(new Pair<>(GitUtils.ref2branch(refInfo.getRef().getName()), commit.getCommitTime()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 1b0cfaf0b5..641ccd986f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -4,11 +4,11 @@ import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MEimport static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;import static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;-import static io.onedev.server.search.entity.EntityQuery.quote;import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;import static io.onedev.server.search.entity.build.BuildQueryLexer.And;import static io.onedev.server.search.entity.build.BuildQueryLexer.AssociatedWithPullRequest;import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;+import static io.onedev.server.util.criteria.Criteria.quote;import static io.onedev.server.util.query.BuildQueryConstants.FIELD_JOB;import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.APPROVE;import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.DELETE_SOURCE_BRANCH;@@ -115,8 +115,7 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.project.comment.CommentInput;import io.onedev.server.web.component.review.ReviewListPanel;-import io.onedev.server.web.component.sideinfo.SideInfoClosed;-import io.onedev.server.web.component.sideinfo.SideInfoOpened;+import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabLink;@@ -134,6 +133,7 @@ import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullReimport io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.ProjectAttachmentSupport;+import io.onedev.server.web.util.PullRequestAware;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QueryPositionSupport;import io.onedev.server.web.util.ReferenceTransformer;@@ -141,7 +141,7 @@ import io.onedev.server.web.util.WicketUtils;import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")-public abstract class PullRequestDetailPage extends ProjectPage {+public abstract class PullRequestDetailPage extends ProjectPage implements PullRequestAware {public static final String PARAM_REQUEST = "request";@@ -644,7 +644,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {@Overridepublic void onClick() {getPullRequestManager().check(getPullRequest());- if (getPullRequest().getCheckError() == null)+ if (getPullRequest().getCheckError() == null)Session.get().success("Pull request is synchronized");}@@ -808,26 +808,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {});}- statusAndBranchesContainer.add(new AjaxLink<Void>("moreInfo") {-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (event.getPayload() instanceof SideInfoClosed) {- SideInfoClosed moreInfoSideClosed = (SideInfoClosed) event.getPayload();- setVisible(true);- moreInfoSideClosed.getHandler().add(this);- }- }-- @Override- public void onClick(AjaxRequestTarget target) {- setVisible(false);- target.add(this);- send(getPage(), Broadcast.BREADTH, new SideInfoOpened(target));- }-- }.setOutputMarkupPlaceholderTag(true));+ statusAndBranchesContainer.add(new SideInfoLink("moreInfo"));return statusAndBranchesContainer;}@@ -1259,6 +1240,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {return params;}+ @Overridepublic PullRequest getPullRequest() {return requestModel.getObject();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.cssindex 5fab917157..d8c951ec6c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css@@ -43,6 +43,8 @@}#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.hash-and-status {width: 170px;+ /* in order align embedded buttons */+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;}#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.hash-and-status>span {margin-left: 4px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex a071b14157..a8ac04d64b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -85,7 +85,7 @@ public class ProjectTagsPage extends ProjectPage {@Overrideprotected List<RefInfo> load() {- List<RefInfo> refs = getProject().getTags();+ List<RefInfo> refs = getProject().getTagRefInfos();if (query != null) {for (Iterator<RefInfo> it = refs.iterator(); it.hasNext();) {String tag = GitUtils.ref2tag(it.next().getRef().getName());diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex 9231f89b4b..795b443f3a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,3 +1,3 @@<wicket:extend><a wicket:id="test">test</a>-s</wicket:extend>\ No newline at end of file+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/util/PullRequestAware.java b/server-core/src/main/java/io/onedev/server/web/util/PullRequestAware.javanew file mode 100644index 0000000000..dcc305542f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/util/PullRequestAware.java@@ -0,0 +1,9 @@+package io.onedev.server.web.util;++import io.onedev.server.model.PullRequest;++public interface PullRequestAware {++ PullRequest getPullRequest();++}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 49b368d6ff..5ec1f2719f 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@@ -78,7 +78,7 @@ public class SuggestionUtils {@Overridepublic List<InputSuggestion> suggest(Project project, String matchWith) {if (SecurityUtils.canReadCode(project)) {- List<String> branchNames = project.getBranches()+ List<String> branchNames = project.getBranchRefInfos().stream().map(it->GitUtils.ref2branch(it.getRef().getName())).sorted()@@ -98,7 +98,7 @@ public class SuggestionUtils {@Overridepublic List<InputSuggestion> suggest(Project project, String matchWith) {if (SecurityUtils.canReadCode(project)) {- List<String> tagNames = project.getTags()+ List<String> tagNames = project.getTagRefInfos().stream().map(it->GitUtils.ref2tag(it.getRef().getName())).sorted()diff --git a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.javaindex a8713ede57..b2de2c4b7e 100644--- a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java@@ -28,25 +28,25 @@ public class InterpolativePatternSetGrammarTest {expected = new PatternSet(Sets.newHashSet("\"hello\""), Sets.newHashSet("\"hello world\""));interpolated = Interpolative.fromString("\\\"hello\\\" -@\"\\\"hello world\\\"\"@").interpolateWith(interpolator);- actual = PatternSet.fromString(interpolated);+ actual = PatternSet.parse(interpolated);assertEquals(expected.getIncludes(), actual.getIncludes());assertEquals(expected.getExcludes(), actual.getExcludes());expected = new PatternSet(Sets.newHashSet("hello world"), Sets.newHashSet());interpolated = Interpolative.fromString("@\"@hello world\"").interpolateWith(interpolator);- actual = PatternSet.fromString(interpolated);+ actual = PatternSet.parse(interpolated);assertEquals(expected.getIncludes(), actual.getIncludes());assertEquals(expected.getExcludes(), actual.getExcludes());expected = new PatternSet(Sets.newHashSet("@robin", "-@alive"), Sets.newHashSet("\"@"));interpolated = Interpolative.fromString("\\@robin \"-\\@alive\" -\\\"\\@").interpolateWith(interpolator);- actual = PatternSet.fromString(interpolated);+ actual = PatternSet.parse(interpolated);assertEquals(expected.getIncludes(), actual.getIncludes());assertEquals(expected.getExcludes(), actual.getExcludes());expected = new PatternSet(Sets.newHashSet("@robin", "hello world", "world"), Sets.newHashSet("hello"));interpolated = Interpolative.fromString("\\@robin @\"hello world\"@ -@hello world@").interpolateWith(interpolator);- actual = PatternSet.fromString(interpolated);+ actual = PatternSet.parse(interpolated);assertEquals(expected.getIncludes(), actual.getIncludes());assertEquals(expected.getExcludes(), actual.getExcludes());}diff --git a/server-core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.java b/server-core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.javaindex a5845a0b30..4f9435bb0e 100644--- a/server-core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.java@@ -12,7 +12,7 @@ public class PatternSetGrammarTest {public void test() {PatternSet expected = new PatternSet(Sets.newHashSet("file1", "file2", "file4 with space", "-file5", "file7 with \""),Sets.newHashSet("file3", "-file6"));- PatternSet actual = PatternSet.fromString("file1 file2 -file3 \"file4 with space\" \"-file5\" -\"-file6\" \"file7 with \\\"\"");+ PatternSet actual = PatternSet.parse("file1 file2 -file3 \"file4 with space\" \"-file5\" -\"-file6\" \"file7 with \\\"\"");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 1bd4b4a90e..105fa08a09 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@@ -168,7 +168,8 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V}private String createNetwork(JobContext jobContext, boolean isWindows, JobLogger jobLogger) {- String network = getName() + "-" + jobContext.getProjectName() + "-" + jobContext.getBuildNumber();+ String network = getName() + "-" + jobContext.getProjectName() + "-"+ + jobContext.getBuildNumber() + "-" + jobContext.getRetried();AtomicBoolean networkExists = new AtomicBoolean(false);Commandline docker = newDocker();@@ -938,7 +939,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, Vif (argument.startsWith(option))return true;} else {- throw new RuntimeException("Invalid option: " + option);+ throw new OneException("Invalid option: " + option);}}}@@ -964,11 +965,11 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V}if (getRunOptions() != null) {String[] arguments = StringUtils.parseQuoteTokens(getRunOptions());- String invalidOptions[] = new String[] {"-w", "--workdir", "-d", "--detach", "-a", "--attach", "-t", "--tty",+ String reservedOptions[] = new String[] {"-w", "--workdir", "-d", "--detach", "-a", "--attach", "-t", "--tty","-i", "--interactive", "--rm", "--restart", "--name"};- if (hasOptions(arguments, invalidOptions)) {+ if (hasOptions(arguments, reservedOptions)) {StringBuilder errorMessage = new StringBuilder("Can not use options: "- + Joiner.on(", ").join(invalidOptions));+ + Joiner.on(", ").join(reservedOptions));context.buildConstraintViolationWithTemplate(errorMessage.toString()).addPropertyNode("runOptions").addConstraintViolation();isValid = false;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 bfdc7311c2..694e7de14b 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@@ -16,6 +16,7 @@ import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import java.util.concurrent.TimeoutException;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicReference;@@ -82,6 +83,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataprivate static final int LABEL_UPDATE_BATCH = 100;+ private static final long NAMESPACE_DELETION_TIMEOUT = 120;+private List<NodeSelectorEntry> nodeSelector = new ArrayList<>();private String serviceAccount;@@ -236,31 +239,40 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}private void deleteNamespace(String namespace, JobLogger jobLogger) {- Commandline cmd = newKubeCtl();- cmd.addArgs("delete", "namespace", namespace);- cmd.execute(new LineConsumer() {-- @Override- public void consume(String line) {- logger.debug(line);- }-- }, new LineConsumer() {-- @Override- public void consume(String line) {- jobLogger.log("Kubernetes: " + line);- }-- }).checkReturnCode();+ try {+ Commandline cmd = newKubeCtl();+ cmd.timeout(NAMESPACE_DELETION_TIMEOUT).addArgs("delete", "namespace", namespace);+ cmd.execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.debug(line);+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ jobLogger.log("Kubernetes: " + line);+ }++ }).checkReturnCode();+ } catch (Exception e) {+ if (ExceptionUtils.find(e, TimeoutException.class) == null)+ throw ExceptionUtils.unchecked(e);+ else+ jobLogger.log("Timed out deleting namespace");+ }}private String createNamespace(@Nullable JobContext jobContext, JobLogger jobLogger) {String namespace = getName() + "-";- if (jobContext != null)- namespace += jobContext.getProjectName().replace('.', '-').replace('_', '-') + "-" + jobContext.getBuildNumber();- else+ if (jobContext != null) {+ namespace += jobContext.getProjectName().replace('.', '-').replace('_', '-') + "-"+ + jobContext.getBuildNumber() + "-" + jobContext.getRetried();+ } else {namespace += "executor-test";+ }AtomicBoolean namespaceExists = new AtomicBoolean(false);Commandline cmd = newKubeCtl();@@ -1258,57 +1270,17 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataprivate void collectContainerLog(String namespace, String podName, String containerName,@Nullable String logEndMessage, JobLogger jobLogger) {- if (logEndMessage != null) {- AtomicReference<Instant> lastInstantRef = new AtomicReference<>(null);- AtomicBoolean endOfLogSeenRef = new AtomicBoolean(false);-- while (true) {- Commandline kubectl = newKubeCtl();- kubectl.addArgs("logs", podName, "-c", containerName, "-n", namespace, "--follow", "--timestamps=true");- if (lastInstantRef.get() != null)- kubectl.addArgs("--since-time=" + DateTimeFormatter.ISO_INSTANT.format(lastInstantRef.get()));-- LineConsumer logConsumer = new LineConsumer() {-- @Override- public void consume(String line) {- if (line.contains("rpc error:") && line.contains("No such container:")- || line.contains("Unable to retrieve container logs for")) {- logger.debug(line);- } else if (line.contains(logEndMessage)) {- endOfLogSeenRef.set(true);- } else if (line.contains(" ")) {- String timestamp = StringUtils.substringBefore(line, " ");- try {- Instant instant = Instant.from(DateTimeFormatter.ISO_INSTANT.parse(timestamp));- if (lastInstantRef.get() == null || lastInstantRef.get().isBefore(instant))- lastInstantRef.set(instant);- jobLogger.log(StringUtils.substringAfter(line, " "));- } catch (DateTimeParseException e) {- jobLogger.log(line);- }- } else {- jobLogger.log(line);- }- }-- };-- kubectl.execute(logConsumer, logConsumer).checkReturnCode();-- if (endOfLogSeenRef.get()) {- break;- } else {- try {- Thread.sleep(1000);- } catch (InterruptedException e) {- throw new RuntimeException(e);- }- }- }- } else {+ Thread thread = Thread.currentThread();+ AtomicReference<String> errorMessageRef = new AtomicReference<>(null);+ AtomicReference<Instant> lastInstantRef = new AtomicReference<>(null);+ AtomicBoolean endOfLogSeenRef = new AtomicBoolean(false);++ while (true) {Commandline kubectl = newKubeCtl();- kubectl.addArgs("logs", podName, "-c", containerName, "-n", namespace, "--follow");+ kubectl.addArgs("logs", podName, "-c", containerName, "-n", namespace, "--follow", "--timestamps=true");+ if (lastInstantRef.get() != null)+ kubectl.addArgs("--since-time=" + DateTimeFormatter.ISO_INSTANT.format(lastInstantRef.get()));+LineConsumer logConsumer = new LineConsumer() {@Override@@ -1316,6 +1288,22 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataif (line.contains("rpc error:") && line.contains("No such container:")|| line.contains("Unable to retrieve container logs for")) {logger.debug(line);+ } else if (logEndMessage != null && line.contains(logEndMessage)) {+ endOfLogSeenRef.set(true);+ } else if (line.contains("Error from server") && line.contains("containerLogs")+ && (line.contains("EOF") || line.contains("Connection refused"))) {+ errorMessageRef.set(line);+ thread.interrupt();+ } else if (line.contains(" ")) {+ String timestamp = StringUtils.substringBefore(line, " ");+ try {+ Instant instant = Instant.from(DateTimeFormatter.ISO_INSTANT.parse(timestamp));+ if (lastInstantRef.get() == null || lastInstantRef.get().isBefore(instant))+ lastInstantRef.set(instant);+ jobLogger.log(StringUtils.substringAfter(line, " "));+ } catch (DateTimeParseException e) {+ jobLogger.log(line);+ }} else {jobLogger.log(line);}@@ -1323,7 +1311,24 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData};- kubectl.execute(logConsumer, logConsumer).checkReturnCode();+ try {+ kubectl.execute(logConsumer, logConsumer).checkReturnCode();+ } catch (Exception e) {+ if (errorMessageRef.get() != null)+ throw new OneException(errorMessageRef.get());+ else+ throw ExceptionUtils.unchecked(e);+ }++ if (logEndMessage == null || endOfLogSeenRef.get()) {+ break;+ } else {+ try {+ Thread.sleep(1000);+ } catch (InterruptedException e) {+ throw new RuntimeException(e);+ }+ }}}@@ -1434,7 +1439,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataif (kernelVersion.contains(entry.getKey()))return entry.getValue();}- throw new RuntimeException("Unsupported windows kernel version: " + kernelVersion);+ throw new OneException("Unsupported windows kernel version: " + kernelVersion);}public String getHelperImageSuffix() {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 e9f503bfe0..2a212445ac 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@@ -44,7 +44,7 @@ public class JobHtmlReport extends JobReport {this.reportName = reportName;}- @Editable(order=1100, description="Specify start page of the report relative to job workspace, for instance: api/index.html. "+ @Editable(order=1100, description="Specify start page of the report relative to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, for instance: api/index.html. "+ "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")@Interpolative(variableSuggester="suggestVariables")@NotEmptydiff --git a/server-product/build/build.sh b/server-product/build/build.shindex 3138481072..dda0970612 100755--- a/server-product/build/build.sh+++ b/server-product/build/build.sh@@ -1,16 +1,24 @@#!/bin/shset -e+docker login -u robinshen -p $@buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout -f ../../pom.xml)mvn clean package -f ../../pom.xmlmkdir ../target/dockercp docker/* ../target/docker++cat << EOF > ../target/docker/run.sh+docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock -v \$(which docker):/usr/bin/docker -v /opt/onedev:/opt/onedev -p 6610:6610 1dev/server:${buildVersion}+EOF+chmod +x ../target/docker/run.sh+unzip ../target/onedev-${buildVersion}.zip -d ../target/dockermv ../target/docker/onedev-${buildVersion} ../target/docker/onedevcp ../target/sandbox/site/lib/mysql* ../target/sandbox/site/lib/postgresql* ../target/docker/onedev/site/libdocker build -t 1dev/server:${buildVersion} ../target/docker-docker login -u robinshen -p $@docker push 1dev/server:${buildVersion}+docker tag 1dev/server:${buildVersion} 1dev/server:latest+docker push 1dev/server:latestcp -r k8s ../target/k8sfind ../target/k8s -name "*.yaml" | xargs sed -i -e "s/\${buildVersion}/${buildVersion}/g"diff --git a/server-product/build/docker/run.sh b/server-product/build/docker/run.shdeleted file mode 100755index 51df1d9ab1..0000000000--- a/server-product/build/docker/run.sh+++ /dev/null@@ -1,3 +0,0 @@-#!/bin/sh-buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout -f ../../pom.xml)-docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):/usr/bin/docker -v /opt/onedev:/opt/onedev -p 6610:6610 1dev/server:${buildVersion}diff --git a/server-product/build/k8s/base/README b/server-product/build/k8s/base/READMEnew file mode 100644index 0000000000..7474107c4b--- /dev/null+++ b/server-product/build/k8s/base/README@@ -0,0 +1 @@+This folder contains base resource definitions which will be inherited by other folders\ No newline at end of filediff --git a/server-product/build/k8s/base/cluster-roles.yaml b/server-product/build/k8s/base/cluster-roles.yamlindex f08e2c918b..c9dfdddaf3 100644--- a/server-product/build/k8s/base/cluster-roles.yaml+++ b/server-product/build/k8s/base/cluster-roles.yaml@@ -5,10 +5,10 @@ metadata:rules:- apiGroups: [""]resources: ["namespaces"]- verbs: ["get", "list", "create", "delete"]+ verbs: ["get", "list", "create", "delete"] #require this permission to run builds in isolated namespaces- apiGroups: [""]resources: ["nodes"]- verbs: ["get", "list", "patch"]+ verbs: ["get", "list", "patch"] #require this permission to label nodes with build cache properties to increase cache hit rate- apiGroups: [""]resources: ["services", "pods", "pods/log", "pods/exec", "secrets", "configmaps", "events"]- verbs: ["get", "list", "watch", "create", "delete"]+ verbs: ["get", "list", "watch", "create", "delete"] #require this permission to run builds as podsdiff --git a/server-product/build/k8s/base/deployments.yaml b/server-product/build/k8s/base/deployments.yamlindex 39071ead9f..425c139aa0 100644--- a/server-product/build/k8s/base/deployments.yaml+++ b/server-product/build/k8s/base/deployments.yaml@@ -39,7 +39,7 @@ spec:name: mysqlkey: password- name: hibernate_hikari_maximumPoolSize- value: 25+ value: "25"initContainers:- name: initimage: busyboxdiff --git a/server-product/build/k8s/maintenance/README b/server-product/build/k8s/maintenance/READMEnew file mode 100644index 0000000000..36d3efc1f4--- /dev/null+++ b/server-product/build/k8s/maintenance/README@@ -0,0 +1,2 @@+Applying this folder will put OneDev into maintenance mode:+https://code.onedev.io/projects/onedev-manual/blob/master/pages/maintenance-mode.md\ No newline at end of filediff --git a/server-product/build/k8s/maintenance/deployments.yaml b/server-product/build/k8s/maintenance/deployments.yamlindex 0e142c4b63..f57d0c0bf4 100644--- a/server-product/build/k8s/maintenance/deployments.yaml+++ b/server-product/build/k8s/maintenance/deployments.yaml@@ -9,5 +9,4 @@ spec:spec:containers:- name: onedev- image: 1dev/servercommand: ["/root/bin/idle.sh"]diff --git a/server-product/build/k8s/mini/README.md b/server-product/build/k8s/mini/READMEsimilarity index 100%rename from server-product/build/k8s/mini/README.mdrename to server-product/build/k8s/mini/READMEdiff --git a/server-product/build/k8s/ssl/README.md b/server-product/build/k8s/ssl/READMEsimilarity index 100%rename from server-product/build/k8s/ssl/README.mdrename to server-product/build/k8s/ssl/READMEdiff --git a/server-product/build/k8s/trust-certs/README.md b/server-product/build/k8s/trust-certs/READMEsimilarity index 100%rename from server-product/build/k8s/trust-certs/README.mdrename to server-product/build/k8s/trust-certs/READMEdiff --git a/server-product/system/conf/server.properties b/server-product/system/conf/server.propertiesindex 8a7381ac97..fc3c5cfcb4 100644--- a/server-product/system/conf/server.properties+++ b/server-product/system/conf/server.properties@@ -11,8 +11,13 @@ http_port=6610##https_port=6643-# path to PKCS12 keystore. Non-absolute path is considered to be relative to OneDev conf directory+# path to PKCS12 keystore. Non-absolute path is considered to be relative to OneDev conf+# directory#keystore=changeit.pfx# password of the keystore#keystore_password=changeit++# path to directory containing CA PEM files to be trusted by OneDev. Non-absolute path is+# considered to be relative to OneDev conf directory+#trust_certs=trust-certs\ No newline at end of file