The Unified and Autonomous Development Platform
Add log instruction support and Maven CI spec detector
Robin Shenfc04c8afd984
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex e0070827c4..cd78202fa4 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -82,11 +82,12 @@ import io.onedev.server.cache.DefaultCommitInfoManager;import io.onedev.server.cache.DefaultUserInfoManager;import io.onedev.server.cache.UserInfoManager;import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.detect.CISpecDetector;+import io.onedev.server.ci.detector.CISpecDetector;import io.onedev.server.ci.job.DefaultJobScheduler;import io.onedev.server.ci.job.JobScheduler;import io.onedev.server.ci.job.log.DefaultLogManager;import io.onedev.server.ci.job.log.LogManager;+import io.onedev.server.ci.job.log.instruction.LogInstruction;import io.onedev.server.ci.job.outcome.DependencyPopulator;import io.onedev.server.command.ApplyDBConstraintsCommand;import io.onedev.server.command.BackupDBCommand;@@ -572,6 +573,8 @@ public class CoreModule extends AbstractPluginModule {}, sessionInterceptor);+ contributeFromPackage(LogInstruction.class, LogInstruction.class);+contribute(PersistListener.class, new PersistListener() {@Overridediff --git a/core/src/main/java/io/onedev/server/ci/Dependency.java b/core/src/main/java/io/onedev/server/ci/Dependency.javaindex 6bd4a0d369..8323ab3da9 100644--- a/core/src/main/java/io/onedev/server/ci/Dependency.java+++ b/core/src/main/java/io/onedev/server/ci/Dependency.java@@ -6,6 +6,7 @@ import java.util.HashSet;import java.util.List;import java.util.Set;+import javax.lang.model.SourceVersion;import javax.validation.ConstraintValidatorContext;import org.hibernate.validator.constraints.NotEmpty;@@ -68,16 +69,22 @@ public class Dependency implements Serializable, Validatable {Set<String> paramNames = new HashSet<>();boolean isValid = true;for (JobParam param: params) {- if (BuildConstants.ALL_FIELDS.contains(param.getName())) {- isValid = false;- context.buildConstraintViolationWithTemplate("Reserved name: " + param.getName())- .addPropertyNode("params").addConstraintViolation();- } else if (paramNames.contains(param.getName())) {- isValid = false;- context.buildConstraintViolationWithTemplate("Duplicate param: " + param.getName())- .addPropertyNode("params").addConstraintViolation();- } else {- paramNames.add(param.getName());+ if (param.getName() != null) {+ if (!SourceVersion.isIdentifier(param.getName())) {+ isValid = false;+ context.buildConstraintViolationWithTemplate("Invalid param name '" + param.getName() + "': " + JobParam.INVALID_CHARS_MESSAGE)+ .addPropertyNode("params").addConstraintViolation();+ } else if (BuildConstants.ALL_FIELDS.contains(param.getName())) {+ isValid = false;+ context.buildConstraintViolationWithTemplate("Reserved name: " + param.getName())+ .addPropertyNode("params").addConstraintViolation();+ } else if (paramNames.contains(param.getName())) {+ isValid = false;+ context.buildConstraintViolationWithTemplate("Duplicate param: " + param.getName())+ .addPropertyNode("params").addConstraintViolation();+ } else {+ paramNames.add(param.getName());+ }}}diff --git a/core/src/main/java/io/onedev/server/ci/detect/CISpecDetector.java b/core/src/main/java/io/onedev/server/ci/detector/CISpecDetector.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/ci/detect/CISpecDetector.javarename to core/src/main/java/io/onedev/server/ci/detector/CISpecDetector.javaindex 8374e36e81..2edeff4815 100644--- a/core/src/main/java/io/onedev/server/ci/detect/CISpecDetector.java+++ b/core/src/main/java/io/onedev/server/ci/detector/CISpecDetector.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.detect;+package io.onedev.server.ci.detector;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/ci/detector/MavenDetector.java b/core/src/main/java/io/onedev/server/ci/detector/MavenDetector.javanew file mode 100644index 0000000000..563aaf1328--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/detector/MavenDetector.java@@ -0,0 +1,59 @@+package io.onedev.server.ci.detector;++import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;++import com.google.common.collect.Lists;++import io.onedev.server.ci.CISpec;+import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.cache.JobCache;+import io.onedev.server.ci.job.trigger.BranchPushedTrigger;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.git.exception.ObjectNotFoundException;+import io.onedev.server.model.Project;++public class MavenDetector implements CISpecDetector {++ @Override+ public CISpec detect(Project project, ObjectId commitId) {+ try {+ project.getBlob(new BlobIdent(commitId.name(), "pom.xml", FileMode.TYPE_FILE));++ CISpec ciSpec = new CISpec();++ Job job = new Job();++ job.setName("ci");+ job.setEnvironment("maven:3.6.1-jdk-8");+ job.setCommands(Lists.newArrayList(+ "mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version",+ "echo",+ "buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)",+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"",+ "echo",+ "mvn clean test"+ ));++ BranchPushedTrigger trigger = new BranchPushedTrigger();+ job.getTriggers().add(trigger);++ JobCache cache = new JobCache();+ cache.setKey("maven-local-repository");+ cache.setPath("/root/.m2");+ job.getCaches().add(cache);++ ciSpec.getJobs().add(job);++ return ciSpec;+ } catch (ObjectNotFoundException e) {+ return null;+ }+ }++ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }++}diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.javaindex 36b06dd4a1..c6778defc8 100644--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java@@ -307,7 +307,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableTenvVars.put("ONEDEV_JOB", job.getName());envVars.put("ONEDEV_BUILD_NUMBER", String.valueOf(build.getNumber()));for (BuildParam param: build.getParams())- envVars.put("ONEDEV_PARAM_" + param.getName(), param.getValue());+ envVars.put("ONEDEV_PARAM_" + param.getName().toUpperCase(), param.getValue());for (JobOutcome outcome: job.getOutcomes()) {PatternSet patternSet = PatternSet.fromString(outcome.getFilePatterns());diff --git a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.javaindex 7a8a560e1e..2d19fe96e9 100644--- a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java+++ b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java@@ -12,6 +12,7 @@ import java.io.ObjectInputStream;import java.io.ObjectOutputStream;import java.util.ArrayList;import java.util.Date;+import java.util.HashMap;import java.util.List;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;@@ -21,6 +22,7 @@ import java.util.regex.Pattern;import javax.inject.Inject;import javax.inject.Singleton;+import org.antlr.v4.runtime.tree.TerminalNode;import org.apache.commons.io.IOUtils;import org.apache.commons.lang3.StringUtils;import org.joda.time.DateTime;@@ -36,9 +38,15 @@ import com.google.common.base.Throwables;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.LockUtils;+import io.onedev.server.OneDev;+import io.onedev.server.ci.job.log.instruction.LogInstruction;+import io.onedev.server.ci.job.log.instruction.LogInstructionParser.InstructionContext;+import io.onedev.server.ci.job.log.instruction.LogInstructionParser.ParamContext;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.event.build.BuildFinished;import io.onedev.server.model.Build;import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.storage.StorageManager;import io.onedev.server.web.websocket.WebSocketManager;@@ -61,12 +69,15 @@ public class DefaultLogManager implements LogManager {private final WebSocketManager webSocketManager;+ private final BuildManager buildManager;+private final Map<Long, LogSnippet> recentSnippets = new ConcurrentHashMap<>();@Inject- public DefaultLogManager(StorageManager storageManager, WebSocketManager webSocketManager) {+ public DefaultLogManager(StorageManager storageManager, WebSocketManager webSocketManager, BuildManager buildManager) {this.storageManager = storageManager;this.webSocketManager = webSocketManager;+ this.buildManager = buildManager;}private File getLogFile(Long projectId, Long buildId) {@@ -80,6 +91,42 @@ public class DefaultLogManager implements LogManager {private static final long serialVersionUID = 1L;+ private void log(LogLevel logLevel, String message) {+ if (logLevel.ordinal() <= loggerLevel.ordinal()) {+ Lock lock = LockUtils.getReadWriteLock(getLockKey(buildId)).writeLock();+ lock.lock();+ try {+ LogSnippet snippet = recentSnippets.get(buildId);+ if (snippet == null) {+ File logFile = getLogFile(projectId, buildId);+ if (!logFile.exists()) {+ snippet = new LogSnippet();+ recentSnippets.put(buildId, snippet);+ }+ }+ if (snippet != null) {+ snippet.entries.add(new LogEntry(new Date(), logLevel, message));+ if (snippet.entries.size() > MAX_CACHE_ENTRIES) {+ File logFile = getLogFile(projectId, buildId);+ try (ObjectOutputStream oos = newOutputStream(logFile)) {+ while (snippet.entries.size() > MIN_CACHE_ENTRIES) {+ LogEntry entry = snippet.entries.remove(0);+ oos.writeObject(entry);+ snippet.offset++;+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ webSocketManager.notifyObservableChange(Build.getLogWebSocketObservable(buildId), null);+ }+ } finally {+ lock.unlock();+ }+ }+ }+@Overridepublic void log(LogLevel logLevel, String message, Throwable throwable) {try {@@ -88,38 +135,40 @@ public class DefaultLogManager implements LogManager {message += "\n " + line;}- if (logLevel.ordinal() <= loggerLevel.ordinal()) {- Lock lock = LockUtils.getReadWriteLock(getLockKey(buildId)).writeLock();- lock.lock();- try {- LogSnippet snippet = recentSnippets.get(buildId);- if (snippet == null) {- File logFile = getLogFile(projectId, buildId);- if (!logFile.exists()) {- snippet = new LogSnippet();- recentSnippets.put(buildId, snippet);- }+ if (message.startsWith(LogInstruction.PREFIX)) {+ log(logLevel, message);++ InstructionContext instructionContext = LogInstruction.parse(message);+ String name = instructionContext.Identifier().getText();++ LogInstruction instruction = null;+ for (LogInstruction extension: OneDev.getExtensions(LogInstruction.class)) {+ if (extension.getName().equals(name)) {+ instruction = extension;+ break;}- if (snippet != null) {- snippet.entries.add(new LogEntry(new Date(), logLevel, message));- if (snippet.entries.size() > MAX_CACHE_ENTRIES) {- File logFile = getLogFile(projectId, buildId);- try (ObjectOutputStream oos = newOutputStream(logFile)) {- while (snippet.entries.size() > MIN_CACHE_ENTRIES) {- LogEntry entry = snippet.entries.remove(0);- oos.writeObject(entry);- snippet.offset++;- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- webSocketManager.notifyObservableChange(Build.getLogWebSocketObservable(buildId), null);+ }++ if (instruction != null) {+ Map<String, List<String>> params = new HashMap<>();+ for (ParamContext paramContext: instructionContext.param()) {+ String paramName;+ if (paramContext.Identifier() != null)+ paramName = paramContext.Identifier().getText();+ else+ paramName = "";+ List<String> paramValues = new ArrayList<>();+ for (TerminalNode terminalNode: paramContext.Value())+ paramValues.add(LogInstruction.unescape(LogInstruction.removeQuotes(terminalNode.getText())));+ params.put(paramName, paramValues);}- } finally {- lock.unlock();+ log(LogLevel.DEBUG, "Executing log instruction '" + name + "'...");+ doInTransaction(instruction, buildId, params);+ } else {+ log(LogLevel.ERROR, "Unsupported log instruction: " + name);}+ } else {+ log(logLevel, message);}} catch (Exception e) {logger.error("Error logging", e);@@ -128,6 +177,11 @@ public class DefaultLogManager implements LogManager {};}++ @Transactional+ protected void doInTransaction(LogInstruction instruction, Long buildId, Map<String, List<String>> params) {+ instruction.execute(buildManager.load(buildId), params);+ }private String getLockKey(Long buildId) {return "build-log: " + buildId;diff --git a/core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4 b/core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4new file mode 100644index 0000000000..2ccd4d2f50--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4@@ -0,0 +1,31 @@+grammar LogInstruction;++instruction+ : PREFIX '[' Identifier param+ ']' EOF+ ;++param+ : (Identifier '=')? Value++ ;++PREFIX+ : '##onedev'+ ;++Identifier+ : [a-zA-Z_][a-zA-Z0-9_]*+ ;++WS+ : ' ' -> skip+ ;++Value+ : '\'' (ESCAPE|~['\\])+? '\''+ ;++fragment++ESCAPE+ : '\\'['\\]+ ;diff --git a/core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.java b/core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.javanew file mode 100644index 0000000000..0392dbc14b--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.java@@ -0,0 +1,73 @@+package io.onedev.server.ci.job.log.instruction;++import java.util.List;+import java.util.Map;++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.launcher.loader.ExtensionPoint;+import io.onedev.server.ci.job.log.instruction.LogInstructionParser.InstructionContext;+import io.onedev.server.exception.OneException;+import io.onedev.server.model.Build;++@ExtensionPoint+public abstract class LogInstruction {++ public static final String PREFIX = "##onedev";++ public static final String ESCAPE_CHARS = "\\\"";++ public abstract String getName();++ public abstract void execute(Build build, Map<String, List<String>> params);++ public static String unescape(String value) {+ return value.replace("\\'", "'").replace("\\\\", "\\");+ }++ public static String removeQuotes(String value) {+ if (value.startsWith("'"))+ value = value.substring(1);+ if (value.endsWith("'"))+ value = value.substring(0, value.length()-1);+ return value;+ }++ public static InstructionContext parse(String instructionString) {+ CharStream is = CharStreams.fromString(instructionString);+ LogInstructionLexer lexer = new LogInstructionLexer(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 log instruction");+ }++ });+ CommonTokenStream tokens = new CommonTokenStream(lexer);+ LogInstructionParser parser = new LogInstructionParser(tokens);+ parser.removeErrorListeners();+ parser.setErrorHandler(new BailErrorStrategy());+ return parser.instruction();+ }++ public static String escape(String value) {+ StringBuilder builder = new StringBuilder();+ for (int i=0; i<value.length(); i++) {+ char ch = value.charAt(i);+ if (ESCAPE_CHARS.indexOf(ch) != -1)+ builder.append("\\");+ builder.append(ch);+ }+ return builder.toString();+ }++}diff --git a/core/src/main/java/io/onedev/server/ci/job/log/instruction/SetBuildVersion.java b/core/src/main/java/io/onedev/server/ci/job/log/instruction/SetBuildVersion.javanew file mode 100644index 0000000000..4330848cd9--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/job/log/instruction/SetBuildVersion.java@@ -0,0 +1,23 @@+package io.onedev.server.ci.job.log.instruction;++import java.util.List;+import java.util.Map;++import javax.inject.Singleton;++import io.onedev.server.model.Build;++@Singleton+public class SetBuildVersion extends LogInstruction {++ @Override+ public String getName() {+ return "SetBuildVersion";+ }++ @Override+ public void execute(Build build, Map<String, List<String>> params) {+ build.setVersion(params.values().iterator().next().iterator().next());+ }++}diff --git a/core/src/main/java/io/onedev/server/ci/job/param/JobParam.java b/core/src/main/java/io/onedev/server/ci/job/param/JobParam.javaindex 72d30813c0..6ffb95991a 100644--- a/core/src/main/java/io/onedev/server/ci/job/param/JobParam.java+++ b/core/src/main/java/io/onedev/server/ci/job/param/JobParam.java@@ -13,6 +13,8 @@ public class JobParam implements Serializable {private static final long serialVersionUID = 1L;+ public static final String INVALID_CHARS_MESSAGE = "param name should start with letter and can only consist of alphanumeric and underscore characters";+private String name;private ValueProvider valueProvider = new SpecifiedValues();diff --git a/core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java b/core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.javaindex 78e566912f..aa996a205a 100644--- a/core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java@@ -6,6 +6,7 @@ import java.util.HashSet;import java.util.List;import java.util.Set;+import javax.lang.model.SourceVersion;import javax.validation.ConstraintValidatorContext;import io.onedev.server.ci.job.Job;@@ -42,16 +43,22 @@ public abstract class JobTrigger implements Validatable, Serializable {Set<String> paramNames = new HashSet<>();boolean isValid = true;for (JobParam param: params) {- if (BuildConstants.ALL_FIELDS.contains(param.getName())) {- isValid = false;- context.buildConstraintViolationWithTemplate("Reserved param name: " + param.getName())- .addPropertyNode("params").addConstraintViolation();- } else if (paramNames.contains(param.getName())) {- isValid = false;- context.buildConstraintViolationWithTemplate("Duplicate param name: " + param.getName())- .addPropertyNode("params").addConstraintViolation();- } else {- paramNames.add(param.getName());+ if (param.getName() != null) {+ if (!SourceVersion.isIdentifier(param.getName())) {+ isValid = false;+ context.buildConstraintViolationWithTemplate("Invalid param name '" + param.getName() + "': " + JobParam.INVALID_CHARS_MESSAGE)+ .addPropertyNode("params").addConstraintViolation();+ } else if (BuildConstants.ALL_FIELDS.contains(param.getName())) {+ isValid = false;+ context.buildConstraintViolationWithTemplate("Reserved param name: " + param.getName())+ .addPropertyNode("params").addConstraintViolation();+ } else if (paramNames.contains(param.getName())) {+ isValid = false;+ context.buildConstraintViolationWithTemplate("Duplicate param name: " + param.getName())+ .addPropertyNode("params").addConstraintViolation();+ } else {+ paramNames.add(param.getName());+ }}}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 2e3437f5e6..540718ed0b 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -14,7 +14,6 @@ import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import org.apache.commons.lang3.StringUtils;import org.hibernate.Session;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;@@ -24,8 +23,8 @@ import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.FileUtils;-import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildDependenceManager;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.event.build.BuildSubmitted;import io.onedev.server.model.Build;@@ -131,38 +130,32 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Overridepublic List<Build> query(Project project, String term, int count) {List<Build> builds = new ArrayList<>();++ EntityCriteria<Build> criteria = newCriteria();- Long number = null;- String numberStr = term;- if (numberStr != null) {- numberStr = numberStr.trim();- if (numberStr.startsWith("#"))- numberStr = numberStr.substring(1);- if (StringUtils.isNumeric(numberStr))- number = Long.valueOf(numberStr);- }+ if (term == null)+ term = "";- if (number != null) {- Build build = find(project, number);- if (build != null)- builds.add(build);- EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- criteria.add(Restrictions.and(- Restrictions.ilike("numberStr", term + "%"),- Restrictions.ne("number", number)- ));- criteria.addOrder(Order.desc("number"));- builds.addAll(query(criteria, 0, count-builds.size()));+ if (term.startsWith("#")) {+ term = term.substring(1);+ try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq("number", buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.ilike("version", "%#" + term + "%"));+ }} else {- EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- if (StringUtils.isNotBlank(term)) {- criteria.add(Restrictions.ilike("numberStr", (term.startsWith("#")? term.substring(1): term) + "%"));+ try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq("number", buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.ilike("version", "%" + term + "%"));}- criteria.addOrder(Order.desc("number"));- builds.addAll(query(criteria, 0, count));- }+ }++ criteria.addOrder(Order.desc("number"));+ builds.addAll(query(criteria, 0, count));+return builds;}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 47ad4bc579..21e7a76fb5 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -18,7 +18,6 @@ import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import org.apache.commons.lang3.StringUtils;import org.hibernate.Session;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;@@ -275,44 +274,36 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Overridepublic List<Issue> query(Project project, String term, int count) {List<Issue> issues = new ArrayList<>();++ EntityCriteria<Issue> criteria = newCriteria();- Long number = null;- String numberStr = term;- if (numberStr != null) {- numberStr = numberStr.trim();- if (numberStr.startsWith("#"))- numberStr = numberStr.substring(1);- if (StringUtils.isNumeric(numberStr))- number = Long.valueOf(numberStr);- }+ if (term == null)+ term = "";- if (number != null) {- Issue issue = find(project, number);- if (issue != null)- issues.add(issue);- EntityCriteria<Issue> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- criteria.add(Restrictions.and(- Restrictions.or(- Restrictions.ilike("title", "%" + term + "%"),- Restrictions.ilike("noSpaceTitle", "%" + term + "%"),- Restrictions.ilike("numberStr", term + "%")),- Restrictions.ne("number", number)- ));- criteria.addOrder(Order.desc("number"));- issues.addAll(query(criteria, 0, count-issues.size()));+ if (term.startsWith("#")) {+ term = term.substring(1);+ try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq("number", buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.or(+ Restrictions.ilike("title", "%#" + term + "%"),+ Restrictions.ilike("noSpaceTitle", "%#" + term + "%")));+ }} else {- EntityCriteria<Issue> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- if (StringUtils.isNotBlank(term)) {+ try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq("number", buildNumber));+ } catch (NumberFormatException e) {criteria.add(Restrictions.or(- Restrictions.ilike("title", "%" + term + "%"),- Restrictions.ilike("noSpaceTitle", "%" + term + "%"),- Restrictions.ilike("numberStr", (term.startsWith("#")? term.substring(1): term) + "%")));+ Restrictions.ilike("title", "%" + term + "%"),+ Restrictions.ilike("noSpaceTitle", "%" + term + "%")));}- criteria.addOrder(Order.desc("number"));- issues.addAll(query(criteria, 0, count));- }+ }++ criteria.addOrder(Order.desc("number"));+ issues.addAll(query(criteria, 0, count));+return issues;}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex b5bcf0ea2a..c076c71473 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -1036,44 +1036,36 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Overridepublic List<PullRequest> query(Project targetProject, String term, int count) {List<PullRequest> requests = new ArrayList<>();++ EntityCriteria<PullRequest> criteria = newCriteria();- Long number = null;- String numberStr = term;- if (numberStr != null) {- numberStr = numberStr.trim();- if (numberStr.startsWith("#"))- numberStr = numberStr.substring(1);- if (StringUtils.isNumeric(numberStr))- number = Long.valueOf(numberStr);- }+ if (term == null)+ term = "";- if (number != null) {- PullRequest request = find(targetProject, number);- if (request != null)- requests.add(request);- EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq("targetProject", targetProject));- criteria.add(Restrictions.and(- Restrictions.or(- Restrictions.ilike("title", "%" + term + "%"),- Restrictions.ilike("noSpaceTitle", "%" + term + "%"),- Restrictions.ilike("numberStr", term + "%")),- Restrictions.ne("number", number)- ));- criteria.addOrder(Order.desc("number"));- requests.addAll(query(criteria, 0, count-requests.size()));+ if (term.startsWith("#")) {+ term = term.substring(1);+ try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq("number", buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.or(+ Restrictions.ilike("title", "%#" + term + "%"),+ Restrictions.ilike("noSpaceTitle", "%#" + term + "%")));+ }} else {- EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq("targetProject", targetProject));- if (StringUtils.isNotBlank(term)) {+ try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq("number", buildNumber));+ } catch (NumberFormatException e) {criteria.add(Restrictions.or(- Restrictions.ilike("title", "%" + term + "%"),- Restrictions.ilike("noSpaceTitle", "%" + term + "%"),- Restrictions.ilike("numberStr", (term.startsWith("#")? term.substring(1): term) + "%")));+ Restrictions.ilike("title", "%" + term + "%"),+ Restrictions.ilike("noSpaceTitle", "%" + term + "%")));}- criteria.addOrder(Order.desc("number"));- requests.addAll(query(criteria, 0, count));- }+ }++ criteria.addOrder(Order.desc("number"));+ requests.addAll(query(criteria, 0, count));+return requests;}diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.javaindex 005955f9f6..ccc174d7ac 100644--- a/core/src/main/java/io/onedev/server/model/Build.java+++ b/core/src/main/java/io/onedev/server/model/Build.java@@ -28,22 +28,20 @@ import org.eclipse.jgit.revwalk.RevWalk;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import com.fasterxml.jackson.annotation.JsonView;import com.google.common.base.Optional;import io.onedev.server.OneDev;import io.onedev.server.cache.BuildInfoManager;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.facade.BuildFacade;-import io.onedev.server.util.jackson.DefaultView;@Entity@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList="o_submitter_id"), @Index(columnList="o_canceller_id"),@Index(columnList="submitterName"), @Index(columnList="cancellerName"), @Index(columnList="commitHash"),- @Index(columnList="number"), @Index(columnList="jobName"), @Index(columnList="numberStr"),- @Index(columnList="status"), @Index(columnList="submitDate"), @Index(columnList="queueingDate"),- @Index(columnList="runningDate"), @Index(columnList="finishDate")},+ @Index(columnList="number"), @Index(columnList="jobName"), @Index(columnList="status"),+ @Index(columnList="submitDate"), @Index(columnList="queueingDate"), @Index(columnList="runningDate"),+ @Index(columnList="finishDate"), @Index(columnList="version")},uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@@ -76,12 +74,9 @@ public class Build extends AbstractEntity {@Column(nullable=false)private String jobName;- private long number;+ private String version;- // used for number search in markdown editor- @Column(nullable=false)- @JsonView(DefaultView.class)- private String numberStr;+ private long number;@Column(nullable=false)private String commitHash;@@ -166,21 +161,20 @@ public class Build extends AbstractEntity {this.jobName = jobName;}- public long getNumber() {- return number;+ public String getVersion() {+ return version;}- public void setNumber(long number) {- this.number = number;- numberStr = String.valueOf(number);+ public void setVersion(String version) {+ this.version = version;}- public String getNumberStr() {- return numberStr;+ public long getNumber() {+ return number;}- public void setNumberStr(String numberStr) {- this.numberStr = numberStr;+ public void setNumber(long number) {+ this.number = number;}public String getCommitHash() {diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 7f047e7e32..cdb54d286b 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -61,10 +61,10 @@ import io.onedev.server.web.editable.annotation.Editable;indexes={@Index(columnList="o_project_id"), @Index(columnList="state"),@Index(columnList="title"), @Index(columnList="noSpaceTitle"),- @Index(columnList="number"), @Index(columnList="numberStr"),- @Index(columnList="submitDate"), @Index(columnList="o_submitter_id"),- @Index(columnList="voteCount"), @Index(columnList="commentCount"),- @Index(columnList="o_milestone_id"), @Index(columnList="updateDate")},+ @Index(columnList="number"), @Index(columnList="submitDate"),+ @Index(columnList="o_submitter_id"), @Index(columnList="voteCount"),+ @Index(columnList="commentCount"), @Index(columnList="o_milestone_id"),+ @Index(columnList="updateDate")},uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})@Editablepublic class Issue extends AbstractEntity implements Referenceable {@@ -108,11 +108,6 @@ public class Issue extends AbstractEntity implements Referenceable {private long number;- // used for number search in markdown editor- @Column(nullable=false)- @JsonView(DefaultView.class)- private String numberStr;-// used for title search in markdown editor@Column(nullable=false)@JsonView(DefaultView.class)@@ -190,7 +185,6 @@ public class Issue extends AbstractEntity implements Referenceable {public void setNumber(long number) {this.number = number;- numberStr = String.valueOf(number);}public User getSubmitter() {diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 75895239dc..05426f51cc 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -71,7 +71,7 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;import io.onedev.server.OneDev;import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.detect.CISpecDetector;+import io.onedev.server.ci.detector.CISpecDetector;import io.onedev.server.entitymanager.BuildQuerySettingManager;import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;import io.onedev.server.entitymanager.CommitQuerySettingManager;diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex 46f468ae21..50b3b7b5ae 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -69,13 +69,13 @@ import io.onedev.server.util.jackson.RestView;@Table(indexes={@Index(columnList="title"), @Index(columnList="uuid"),- @Index(columnList="numberStr"), @Index(columnList="noSpaceTitle"),- @Index(columnList="number"), @Index(columnList="o_targetProject_id"),- @Index(columnList="submitDate"), @Index(columnList="updateDate"),- @Index(columnList="o_sourceProject_id"), @Index(columnList="o_submitter_id"),- @Index(columnList="headCommitHash"), @Index(columnList="PREVIEW_REQUEST_HEAD"),- @Index(columnList="CLOSE_DATE"), @Index(columnList="CLOSE_STATUS"),- @Index(columnList="CLOSE_USER"), @Index(columnList="CLOSE_USER_NAME")},+ @Index(columnList="noSpaceTitle"), @Index(columnList="number"),+ @Index(columnList="o_targetProject_id"), @Index(columnList="submitDate"),+ @Index(columnList="updateDate"), @Index(columnList="o_sourceProject_id"),+ @Index(columnList="o_submitter_id"), @Index(columnList="headCommitHash"),+ @Index(columnList="PREVIEW_REQUEST_HEAD"), @Index(columnList="CLOSE_DATE"),+ @Index(columnList="CLOSE_STATUS"), @Index(columnList="CLOSE_USER"),+ @Index(columnList="CLOSE_USER_NAME")},uniqueConstraints={@UniqueConstraint(columnNames={"o_targetProject_id", "number"})})public class PullRequest extends AbstractEntity implements Referenceable {@@ -122,11 +122,6 @@ public class PullRequest extends AbstractEntity implements Referenceable {@Column(nullable=true)private Date lastCodeCommentActivityDate;- // used for number search in markdown editor- @Column(nullable=false)- @JsonView(DefaultView.class)- private String numberStr;-// used for title search in markdown editor@Column(nullable=false)@JsonView(DefaultView.class)@@ -618,7 +613,6 @@ public class PullRequest extends AbstractEntity implements Referenceable {public void setNumber(long number) {this.number = number;- numberStr = String.valueOf(number);}public int getCommentCount() {diff --git a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex 39e9b724b7..6450ab9201 100644--- a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -89,22 +89,22 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa}}- public static Issue getIssue(Project project, String numberStr) {- if (numberStr.startsWith("#"))- numberStr = numberStr.substring(1);- Issue issue = OneDev.getInstance(IssueManager.class).find(project, getLongValue(numberStr));+ public static Issue getIssue(Project project, String number) {+ if (number.startsWith("#"))+ number = number.substring(1);+ Issue issue = OneDev.getInstance(IssueManager.class).find(project, getLongValue(number));if (issue != null)return issue;else- throw new OneException("Unable to find issue: #" + numberStr);+ throw new OneException("Unable to find issue: #" + number);}- public static Build getBuild(Project project, String numberStr) {- Build build = OneDev.getInstance(BuildManager.class).find(project, getLongValue(numberStr));+ public static Build getBuild(Project project, String number) {+ Build build = OneDev.getInstance(BuildManager.class).find(project, getLongValue(number));if (build != null)return build;else- throw new OneException("Unable to find build: #" + numberStr);+ throw new OneException("Unable to find build: #" + number);}public boolean needsLogin() {diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex 89bca2e79b..51fdafc096 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.build;import static io.onedev.server.util.BuildConstants.FIELD_COMMIT;import static io.onedev.server.util.BuildConstants.FIELD_FINISH_DATE;+import static io.onedev.server.util.BuildConstants.FIELD_VERSION;import static io.onedev.server.util.BuildConstants.FIELD_JOB;import static io.onedev.server.util.BuildConstants.FIELD_NUMBER;import static io.onedev.server.util.BuildConstants.FIELD_QUEUEING_DATE;@@ -173,6 +174,8 @@ public class BuildQuery extends EntityQuery<Build> {return new JobCriteria(value);case FIELD_NUMBER:return new NumberCriteria(getIntValue(value), operator);+ case FIELD_VERSION:+ return new VersionCriteria(value);default:return new ParamCriteria(fieldName, value);}@@ -246,7 +249,7 @@ public class BuildQuery extends EntityQuery<Build> {break;case BuildQueryLexer.Is:if (!fieldName.equals(FIELD_COMMIT) && !fieldName.equals(FIELD_JOB) && !fieldName.equals(FIELD_NUMBER)- && !paramNames.contains(fieldName)) {+ && !fieldName.equals(FIELD_VERSION) && !paramNames.contains(fieldName)) {throw newOperatorException(fieldName, operator);}break;diff --git a/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.javanew file mode 100644index 0000000000..5db89007ad--- /dev/null+++ b/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java@@ -0,0 +1,45 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Build;+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.QueryBuildContext;+import io.onedev.server.util.BuildConstants;++public class VersionCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ private final String value;++ public VersionCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {+ Path<String> attribute = context.getRoot().get(BuildConstants.ATTR_VERSION);+ String normalized = value.toLowerCase().replace("*", "%");+ return context.getBuilder().like(context.getBuilder().lower(attribute), normalized);+ }++ @Override+ public boolean matches(Build build, User user) {+ return build.getVersion().toLowerCase().contains(value.toLowerCase());+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return BuildQuery.quote(BuildConstants.FIELD_VERSION) + " " + BuildQuery.getRuleName(BuildQueryLexer.Is) + " " + BuildQuery.quote(value);+ }++}diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.javaindex 308e8f5aba..4e5e519a80 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java@@ -42,7 +42,7 @@ public class FixedInCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.getRuleName(IssueQueryLexer.FixedInBuild) + IssueQuery.quote("#" + build.getNumberStr());+ return IssueQuery.getRuleName(IssueQueryLexer.FixedInBuild) + IssueQuery.quote("#" + build.getNumber());}}diff --git a/core/src/main/java/io/onedev/server/util/BuildConstants.java b/core/src/main/java/io/onedev/server/util/BuildConstants.javaindex 80642579bd..8aa3a18c3c 100644--- a/core/src/main/java/io/onedev/server/util/BuildConstants.java+++ b/core/src/main/java/io/onedev/server/util/BuildConstants.java@@ -17,6 +17,10 @@ public class BuildConstants {public static final String ATTR_NUMBER = "number";+ public static final String FIELD_VERSION = "Version";++ public static final String ATTR_VERSION = "version";+public static final String FIELD_PROJECT = "project";public static final String ATTR_PROJECT = "project";@@ -62,10 +66,10 @@ public class BuildConstants {public static final Set<String> ALL_FIELDS = Sets.newHashSet(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_PROJECT);+ FIELD_COMMIT, FIELD_PROJECT, FIELD_VERSION);public static final List<String> QUERY_FIELDS = Lists.newArrayList(- FIELD_JOB, FIELD_NUMBER, FIELD_COMMIT, FIELD_SUBMIT_DATE,+ FIELD_JOB, FIELD_NUMBER, FIELD_VERSION, FIELD_COMMIT, FIELD_SUBMIT_DATE,FIELD_QUEUEING_DATE, FIELD_RUNNING_DATE, FIELD_FINISH_DATE);public static final Map<String, String> ORDER_FIELDS = new LinkedHashMap<>();diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputContext.java b/core/src/main/java/io/onedev/server/util/inputspec/InputContext.javaindex 78d8862eb3..dc8dd339ff 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/InputContext.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputContext.java@@ -11,7 +11,8 @@ public interface InputContext {@NullableInputSpec getInputSpec(String inputName);- boolean isReservedName(String inputName);+ @Nullable+ String validateName(String inputName);}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/util/validation/InputNameValidator.java b/core/src/main/java/io/onedev/server/util/validation/InputNameValidator.javaindex be7eedb1d1..19200f0119 100644--- a/core/src/main/java/io/onedev/server/util/validation/InputNameValidator.java+++ b/core/src/main/java/io/onedev/server/util/validation/InputNameValidator.java@@ -16,14 +16,16 @@ public class InputNameValidator implements ConstraintValidator<InputName, Stringpublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {if (value == null) {return true;- } else if (OneContext.get().getInputContext().isReservedName(value)) {- constraintContext.disableDefaultConstraintViolation();- String message = "'" + value + "' is a reserved name";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;} else {- return true;- }+ String errorMessage = OneContext.get().getInputContext().validateName(value);+ if (errorMessage != null) {+ constraintContext.disableDefaultConstraintViolation();+ constraintContext.buildConstraintViolationWithTemplate(errorMessage).addConstraintViolation();+ return false;+ } else {+ return true;+ }+ }}}diff --git a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex 0804f76c31..2df01d43be 100644--- a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -153,4 +153,21 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {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+ List<Element> elements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ if (!elements.isEmpty() && elements.get(0).getFirstMatchedToken().getText().equals("\"" + BuildConstants.FIELD_VERSION + "\""))+ hints.add("Use * to match any part of version");+ }+ }+ }+ return hints;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.javaindex 75bb79d401..db56bb23a5 100644--- a/core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java+++ b/core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java@@ -6,6 +6,7 @@ import java.util.List;import org.apache.wicket.model.IModel;import org.json.JSONException;import org.json.JSONWriter;+import org.unbescape.html.HtmlEscape;import com.google.common.collect.Lists;@@ -38,7 +39,9 @@ public class BuildChoiceProvider extends ChoiceProvider<Build> {public void toJson(Build choice, JSONWriter writer) throws JSONException {writer.key("id").value(choice.getId())- .key("number").value(choice.getNumber());+ .key("number").value(choice.getNumber())+ .key("version").value(HtmlEscape.escapeHtml5(choice.getVersion()))+ .key("jobName").value(HtmlEscape.escapeHtml5(choice.getJobName()));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js b/core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.jsindex 6b0f936abc..fafd4f8277 100644--- a/core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js+++ b/core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js@@ -4,9 +4,8 @@ onedev.server.buildChoiceFormatter = {},formatResult: function(build) {- return "<div class='build'>#" + build.number + "</div>";+ return "<div class='build'>#" + build.number + " (" + build.jobName + " : " + build.version + ")</div>";},-escapeMarkup: function(m) {return m;},diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 8a7d71c665..eadf8fbc79 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -259,7 +259,7 @@ public abstract class BuildListPanel extends GenericPanel<String> {List<IColumn<Build, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_NUMBER)) {+ columns.add(new AbstractColumn<Build, Void>(Model.of("Number")) {@Overridepublic String getCssClass() {@@ -271,7 +271,10 @@ public abstract class BuildListPanel extends GenericPanel<String> {Fragment fragment = new Fragment(componentId, "numberFrag", BuildListPanel.this);Build build = rowModel.getObject();Link<Void> link = new BookmarkablePageLink<Void>("link", BuildDetailPage.class, BuildDetailPage.paramsOf(build));- link.add(new Label("label", "#" + build.getNumber()));+ if (build.getVersion() != null)+ link.add(new Label("label", "#" + build.getNumber() + " (" + build.getVersion() + ")"));+ else+ link.add(new Label("label", "#" + build.getNumber()));fragment.add(link);cellItem.add(fragment);}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex 8531be31e0..e7056c3d3b 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -145,7 +145,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement}@Override- public boolean isReservedName(String inputName) {+ public String validateName(String inputName) {throw new UnsupportedOperationException();}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex 38a70aa2a9..0d376673e1 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -322,7 +322,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {}@Override- public boolean isReservedName(String inputName) {+ public String validateName(String inputName) {throw new UnsupportedOperationException();}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.javaindex 3ab21de447..2487314fff 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java@@ -120,7 +120,7 @@ abstract class TransitionEditPanel extends Panel implements InputContext {}@Override- public boolean isReservedName(String inputName) {+ public String validateName(String inputName) {throw new UnsupportedOperationException();}diff --git a/core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java b/core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.javaindex bcd3e9a282..1370e9b781 100644--- a/core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java+++ b/core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java@@ -73,9 +73,14 @@ public abstract class CommentInput extends MarkdownEditor {criteria.add(Restrictions.eq("targetProject", getProject()));if (StringUtils.isNotBlank(query)) {query = StringUtils.deleteWhitespace(query);- criteria.add(Restrictions.or(- Restrictions.ilike("noSpaceTitle", query, MatchMode.ANYWHERE),- Restrictions.ilike("numberStr", query, MatchMode.START)));+ try {+ long requestNumber = Long.parseLong(query);+ criteria.add(Restrictions.or(+ Restrictions.ilike("noSpaceTitle", query, MatchMode.ANYWHERE),+ Restrictions.eq("number", requestNumber)));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.ilike("noSpaceTitle", query, MatchMode.ANYWHERE));+ }}criteria.addOrder(Order.desc("number"));return OneDev.getInstance(Dao.class).query(criteria, 0, count);@@ -90,9 +95,14 @@ public abstract class CommentInput extends MarkdownEditor {criteria.add(Restrictions.eq("project", getProject()));if (StringUtils.isNotBlank(query)) {query = StringUtils.deleteWhitespace(query);- criteria.add(Restrictions.or(- Restrictions.ilike("noSpaceTitle", query, MatchMode.ANYWHERE),- Restrictions.ilike("numberStr", query, MatchMode.START)));+ try {+ long issueNumber = Long.parseLong(query);+ criteria.add(Restrictions.or(+ Restrictions.ilike("noSpaceTitle", query, MatchMode.ANYWHERE),+ Restrictions.eq("number", issueNumber)));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.ilike("noSpaceTitle", query, MatchMode.ANYWHERE));+ }}criteria.addOrder(Order.desc("number"));return OneDev.getInstance(Dao.class).query(criteria, 0, count);diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.javaindex 8d450170d1..6970f4ee9e 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java@@ -206,8 +206,11 @@ abstract class FieldEditPanel extends Panel implements InputContext {}@Override- public boolean isReservedName(String inputName) {- return IssueConstants.ALL_FIELDS.contains(inputName);+ public String validateName(String inputName) {+ if (IssueConstants.ALL_FIELDS.contains(inputName))+ return "'" + inputName + "' is reserved";+ else+ return null;}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.javaindex a1971321ae..6090f22a9e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.java@@ -3,6 +3,8 @@ package io.onedev.server.web.page.project.blob.render.renderers.cispec.jobparam;import java.util.ArrayList;import java.util.List;+import javax.lang.model.SourceVersion;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -11,6 +13,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;+import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.util.BuildConstants;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;@@ -147,8 +150,13 @@ abstract class ParamEditPanel extends Panel implements InputContext {}@Override- public boolean isReservedName(String inputName) {- return BuildConstants.ALL_FIELDS.contains(inputName);+ public String validateName(String inputName) {+ if (!SourceVersion.isIdentifier(inputName))+ return JobParam.INVALID_CHARS_MESSAGE;+ else if (BuildConstants.ALL_FIELDS.contains(inputName))+ return "'" + inputName + "' is reserved";+ else+ return null;}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex eb73ecc267..862752e2e4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -351,7 +351,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte}@Override- public boolean isReservedName(String inputName) {+ public String validateName(String inputName) {throw new UnsupportedOperationException();}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.javaindex 9e605e3868..164d4f86fc 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java@@ -101,7 +101,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {}@Override- public boolean isReservedName(String inputName) {+ public String validateName(String inputName) {throw new UnsupportedOperationException();}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.javaindex 85e992f96c..1bdba27004 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java@@ -119,7 +119,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {}@Override- public boolean isReservedName(String inputName) {+ public String validateName(String inputName) {throw new UnsupportedOperationException();}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex b5879a3279..87b9963583 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -287,7 +287,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex}@Override- public boolean isReservedName(String inputName) {+ public String validateName(String inputName) {throw new UnsupportedOperationException();}diff --git a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 0e8dc492d6..f25cab0f03 100644--- a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -118,8 +118,15 @@ public class SuggestionUtils {List<InputSuggestion> suggestions = new ArrayList<>();for (Build build: OneDev.getInstance(BuildManager.class).query(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS)) {InputSuggestion suggestion;- Range match = Range.match(build.getNumberStr(), matchWith, true, false, true);- suggestion = new InputSuggestion(build.getNumberStr(), null, match);++ String description;+ if (build.getVersion() != null)+ description = build.getJobName() + " : " + build.getVersion();+ else+ description = null;++ suggestion = new InputSuggestion("#" + build.getNumber(), description, null);+suggestions.add(suggestion);}return suggestions;