The Unified and Autonomous Development Platform
Do not allow spaces in issue field name
Robin Shena10c680b28fd
diff --git a/core/.project b/core/.projectindex 53fd1f078f..667e22d4d7 100644--- a/core/.project+++ b/core/.project@@ -5,6 +5,11 @@<projects></projects><buildSpec>+ <buildCommand>+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>+ <arguments>+ </arguments>+ </buildCommand><buildCommand><name>org.eclipse.jdt.core.javabuilder</name><arguments>@@ -25,5 +30,6 @@<nature>org.eclipse.jdt.core.javanature</nature><nature>org.eclipse.m2e.core.maven2Nature</nature><nature>org.eclipse.wst.jsdt.core.jsNature</nature>+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature></natures></projectDescription>diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 2c82a2c1d4..7202db3056 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -38,8 +38,8 @@ import io.onedev.utils.BeanUtils;@Table(indexes={@Index(columnList="g_project_id"), @Index(columnList="state"),- @Index(columnList="title"), @Index(columnList="g_reporter_id"),- @Index(columnList="votes")})+ @Index(columnList="title"), @Index(columnList="g_submitter_id"),+ @Index(columnList="submitDate"), @Index(columnList="votes")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editablepublic class Issue extends AbstractEntity {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4 b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4new file mode 100644index 0000000000..5d77ee287d--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4@@ -0,0 +1,14 @@+grammar IssueQuery;++query+ : criteria* 'order by' FieldName (',' FieldName)* EOF+ ;++criteria+ : 'c'+ ;++FieldName+ : ~[~`!@#$%^&()=+;',/\\:*?\"|(){}<> \[\]]+ ;+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 0ec48b0b77..04a54ce5cd 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,3 +11,4 @@ public interface InputContext {boolean isReservedName(String inputName);}+\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java b/core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.javaindex a0149bb4d9..4e24c1e3a8 100644--- a/core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java+++ b/core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java@@ -1,34 +1,31 @@package io.onedev.server.util.validation;-import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.server.util.OneContext;import io.onedev.server.util.validation.annotation.GroupName;public class GroupNameValidator implements ConstraintValidator<GroupName, String> {- private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");+ private static final NameValidator NAME_VALIDATOR = new NameValidator();public void initialize(GroupName constaintAnnotation) {}public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {- return true;- } else if (!pattern.matcher(value).find()) {- constraintContext.disableDefaultConstraintViolation();- String message = "Only alphanumeric, underscore, dash, and dot are accepted";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- } else if (value.equals("new")) {- constraintContext.disableDefaultConstraintViolation();- String message = "'new' is reserved and can not be used as group name";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;+ boolean isValid = NAME_VALIDATOR.isValid(value, constraintContext);+ if (isValid) {+ if (OneContext.get().getInputContext().isReservedName(value)) {+ constraintContext.disableDefaultConstraintViolation();+ String message = "'" + value + "' is a reserved name";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else {+ return true;+ }} else {- return true;+ return false;}}diff --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 5f39eac5bd..7242680029 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@@ -1,7 +1,5 @@package io.onedev.server.util.validation;-import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;@@ -10,26 +8,24 @@ import io.onedev.server.util.validation.annotation.InputName;public class InputNameValidator implements ConstraintValidator<InputName, String> {- private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");+ private static final NameValidator NAME_VALIDATOR = new NameValidator();public void initialize(InputName constaintAnnotation) {}public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {- return true;- } else if (!pattern.matcher(value).find()) {- constraintContext.disableDefaultConstraintViolation();- String message = "Only alphanumeric, underscore, dash, and dot are accepted";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- } else if (OneContext.get().getInputContext().isReservedName(value)) {- constraintContext.disableDefaultConstraintViolation();- String message = "'" + value + "' is a reserved name";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;+ boolean isValid = NAME_VALIDATOR.isValid(value, constraintContext);+ if (isValid) {+ if (OneContext.get().getInputContext().isReservedName(value)) {+ constraintContext.disableDefaultConstraintViolation();+ String message = "'" + value + "' is a reserved name";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else {+ return true;+ }} else {- return true;+ return false;}}diff --git a/core/src/main/java/io/onedev/server/util/validation/NameValidator.java b/core/src/main/java/io/onedev/server/util/validation/NameValidator.javaindex 12bf7467fe..dc52a4f846 100644--- a/core/src/main/java/io/onedev/server/util/validation/NameValidator.java+++ b/core/src/main/java/io/onedev/server/util/validation/NameValidator.java@@ -1,24 +1,29 @@package io.onedev.server.util.validation;+import java.util.regex.Pattern;+import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;import io.onedev.server.util.validation.annotation.Name;-import io.onedev.utils.StringUtils;public class NameValidator implements ConstraintValidator<Name, String> {- // insert spaces in invalid chars in order to get a pretty display for- // name validation error message. Refer to @Name annotation for more detail.- public static final String invalidChars = ", / \\ : * ? \" < > | [ ]";+ private static final Pattern PATTERN = Pattern.compile("[\\w-\\.]+");public void initialize(Name constaintAnnotation) {}public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null)+ if (value == null) {return true;-- return StringUtils.containsNone(value, StringUtils.deleteWhitespace(invalidChars));+ } else if (!PATTERN.matcher(value).matches()) {+ constraintContext.disableDefaultConstraintViolation();+ String message = "Only alphanumeric, underscore, dash, and dot are accepted";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else {+ return true;+ }}}diff --git a/core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java b/core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.javaindex 54fbea5061..266b650b31 100644--- a/core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java+++ b/core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java@@ -1,34 +1,31 @@package io.onedev.server.util.validation;-import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.server.util.OneContext;import io.onedev.server.util.validation.annotation.ProjectName;public class ProjectNameValidator implements ConstraintValidator<ProjectName, String> {- private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");+ private static final NameValidator NAME_VALIDATOR = new NameValidator();public void initialize(ProjectName constaintAnnotation) {}public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {- return true;- } else if (!pattern.matcher(value).find()) {- constraintContext.disableDefaultConstraintViolation();- String message = "Only alphanumeric, underscore, dash, and dot are accepted";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- } else if (value.equals("new")) {- constraintContext.disableDefaultConstraintViolation();- String message = "'new' is reserved and can not be used as project name";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;+ boolean isValid = NAME_VALIDATOR.isValid(value, constraintContext);+ if (isValid) {+ if (OneContext.get().getInputContext().isReservedName(value)) {+ constraintContext.disableDefaultConstraintViolation();+ String message = "'" + value + "' is a reserved name";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else {+ return true;+ }} else {- return true;+ return false;}}diff --git a/core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java b/core/src/main/java/io/onedev/server/util/validation/UserNameValidator.javaindex 4313e3183a..9118a53085 100644--- a/core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java+++ b/core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java@@ -1,34 +1,31 @@package io.onedev.server.util.validation;-import java.util.regex.Pattern;-import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.server.util.OneContext;import io.onedev.server.util.validation.annotation.UserName;public class UserNameValidator implements ConstraintValidator<UserName, String> {- private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");+ private static final NameValidator NAME_VALIDATOR = new NameValidator();public void initialize(UserName constaintAnnotation) {}public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {- return true;- } else if (!pattern.matcher(value).find()) {- constraintContext.disableDefaultConstraintViolation();- String message = "Only alphanumeric, underscore, dash, and dot are accepted";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- } else if (value.equals("new")) {- constraintContext.disableDefaultConstraintViolation();- String message = "'new' is reserved and can not be used as user name";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;+ boolean isValid = NAME_VALIDATOR.isValid(value, constraintContext);+ if (isValid) {+ if (OneContext.get().getInputContext().isReservedName(value)) {+ constraintContext.disableDefaultConstraintViolation();+ String message = "'" + value + "' is a reserved name";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else {+ return true;+ }} else {- return true;+ return false;}}diff --git a/core/src/main/java/io/onedev/server/util/validation/annotation/Name.java b/core/src/main/java/io/onedev/server/util/validation/annotation/Name.javaindex fbaefe55ee..89c9958c87 100644--- a/core/src/main/java/io/onedev/server/util/validation/annotation/Name.java+++ b/core/src/main/java/io/onedev/server/util/validation/annotation/Name.java@@ -17,9 +17,8 @@ import io.onedev.server.util.validation.NameValidator;@Retention(RetentionPolicy.RUNTIME)@Constraint(validatedBy=NameValidator.class)public @interface Name {- String message() default "Name can not contain any of these characters:\n" +- NameValidator.invalidChars;-+ String message() default "";+Class<?>[] groups() default {};Class<? extends Payload>[] payload() default {};