Skip to content

The Unified and Autonomous Development Platform

Move file protection validation to its own class

Robin Shen08e49665b540
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.java
index 23eec77820..7647de1f29 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
@@ -9,7 +9,6 @@ import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
-import javax.validation.ConstraintValidatorContext;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
@@ -29,8 +28,6 @@ import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
import io.onedev.server.util.usermatcher.Anyone;
import io.onedev.server.util.usermatcher.UserMatcher;
-import io.onedev.server.util.validation.Validatable;
-import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Horizontal;
import io.onedev.server.web.editable.annotation.JobChoice;
@@ -40,8 +37,7 @@ import io.onedev.server.web.util.SuggestionUtils;
@Editable
@Horizontal
-@ClassValidating
-public class BranchProtection implements Serializable, Validatable {
+public class BranchProtection implements Serializable {
private static final long serialVersionUID = 1L;
@@ -312,21 +308,4 @@ public class BranchProtection implements Serializable, Validatable {
return !requiredJobNames.isEmpty();
}
- @Override
- public boolean isValid(ConstraintValidatorContext context) {
- int index = 1;
- for (FileProtection fileProtection: getFileProtections()) {
- if (fileProtection.getJobNames().isEmpty() && fileProtection.getReviewRequirement() == null) {
- context.disableDefaultConstraintViolation();
- String message = "File protection # " + index + ": Either reviewer or required builds should be specified";
- context.buildConstraintViolationWithTemplate(message)
- .addPropertyNode("fileProtections")
- .addConstraintViolation();
- return false;
- }
- index++;
- }
- return true;
- }
-
}
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.java
index 5a5061185c..f529234719 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
@@ -4,10 +4,14 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import javax.validation.ConstraintValidatorContext;
+
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.model.Project;
+import io.onedev.server.util.validation.Validatable;
+import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.JobChoice;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@@ -15,7 +19,8 @@ import io.onedev.server.web.editable.annotation.Patterns;
import io.onedev.server.web.util.SuggestionUtils;
@Editable
-public class FileProtection implements Serializable {
+@ClassValidating
+public class FileProtection implements Serializable, Validatable {
private static final long serialVersionUID = 1L;
@@ -62,5 +67,17 @@ public class FileProtection implements Serializable {
public void setJobNames(List<String> jobNames) {
this.jobNames = jobNames;
}
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ if (getJobNames().isEmpty() && getReviewRequirement() == null) {
+ context.disableDefaultConstraintViolation();
+ String message = "Either reviewer or required builds should be specified";
+ context.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ } else {
+ return true;
+ }
+ }
}