commit 42642d076fec2ba890898b599ecfd347b05d8e5e
author Nguyen Tuan Khang Phan <nguyen.tuan.khang.phan@ericsson.com> Mon Dec 23 17:43:22 2019 -0500
committer Nguyen Tuan Khang Phan <nguyen.tuan.khang.phan@ericsson.com> Mon Dec 23 17:46:39 2019 -0500
tree e634a0764042c873b78acbea91e755ecdf1ca0eb
parent 0cee9bf52834ee4c56686ed9894b0c78e60157ac
parent a37d5de05e7374da547da2d0cef9ba6b0bd2f1ac

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  ProjectCreationValidator: apply GJF
  Provide better error message when project name contains "/"

Change-Id: Iadfd319affc2f74d95051e691a3e58c6b47e4c83

src/main/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidator.java

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 23a8afa..f764b9e 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidator.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidator.java
@@ -61,7 +61,10 @@
       "Project name cannot contains spaces." + SEE_DOCUMENTATION_MSG;
 
   private static final String ROOT_PROJECT_CANNOT_CONTAINS_SLASHES_MSG =
-      "Root project name cannot contains slashes." + SEE_DOCUMENTATION_MSG;
+      "Since the \"Rights Inherit From\" field is empty, "
+          + "\"%s\" is considered a root project whose parent is \"%s\". "
+          + "Root project names cannot contain slashes."
+          + SEE_DOCUMENTATION_MSG;
 
   private static final String REGULAR_PROJECT_NOT_ALLOWED_AS_ROOT_MSG =
       "Regular projects are not allowed as root.\n\n"
@@ -199,7 +202,11 @@
     if (name.contains("/")) {
       log.debug("rejecting creation of {}: name contains slashes", name);
       throw new ValidationException(
-          String.format(ROOT_PROJECT_CANNOT_CONTAINS_SLASHES_MSG, documentationUrl));
+          String.format(
+              ROOT_PROJECT_CANNOT_CONTAINS_SLASHES_MSG,
+              name,
+              allProjectsName.get(),
+              documentationUrl));
     }
     if (!permissionOnly) {
       log.debug("rejecting creation of {}: missing permissions only option", name);