ProjectCreationValidator: Bypass spaces check in project name for admins
All of behaviour of project-group-structure plugin was bypassed for
admins, except whitespace check in project name. Bypass whitespace check
too for consistency reasons.
Change-Id: I343c9ad267da4753b17a19a4ce7cbdb3b930a084
diff --git a/src/main/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidator.java b/src/main/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidator.java
index 331c968..c93819f 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidator.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidator.java
@@ -114,12 +114,6 @@
public void validateNewProject(CreateProjectArgs args) throws ValidationException {
String name = args.getProjectName();
log.debug("validating creation of {}", name);
- if (name.contains(" ")) {
- throw new ValidationException(
- String.format(PROJECT_CANNOT_CONTAINS_SPACES_MSG, documentationUrl));
- }
-
- Project.NameKey newParent = args.newParent;
try {
permissionBackend.user(self.get()).check(GlobalPermission.ADMINISTRATE_SERVER);
@@ -134,6 +128,13 @@
// continuing
}
+ if (name.contains(" ")) {
+ throw new ValidationException(
+ String.format(PROJECT_CANNOT_CONTAINS_SPACES_MSG, documentationUrl));
+ }
+
+ Project.NameKey newParent = args.newParent;
+
if (allProjectsName.get().equals(newParent)) {
validateRootProject(name, args.permissionsOnly);
} else {