commit 88b0984638857ac7139de83b18dc7cad23670b4d
author Dave Borowitz <dborowitz@google.com> Tue Dec 22 17:59:52 2015 -0500
committer Dave Borowitz <dborowitz@google.com> Tue Dec 22 18:04:03 2015 -0500
tree ea402a94b835e6b69896362685f0a095b30b93e4
parent eea84e7e07ecf6ebb70ea5a6b0cde67f5a5576af

Use descriptive error messages for MergeValidationExceptions

These are no longer tied to CommitMergeStatus, so we can actually say
what we mean rather than picking a similar-sounding status enum out of
a hat.

Change-Id: I7d1429c885a99503fe8cdfa8fe8925e7125fcb35

src/main/java/com/googlesource/gerrit/plugins/cookbook/MergeUserValidator.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/cookbook/MergeUserValidator.java b/src/main/java/com/googlesource/gerrit/plugins/cookbook/MergeUserValidator.java
index 2e35854..3217fd1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/cookbook/MergeUserValidator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/cookbook/MergeUserValidator.java
@@ -21,7 +21,6 @@
 import com.google.gerrit.server.ApprovalsUtil;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.git.CodeReviewCommit;
-import com.google.gerrit.server.git.CommitMergeStatus;
 import com.google.gerrit.server.git.validators.MergeValidationException;
 import com.google.gerrit.server.git.validators.MergeValidationListener;
 import com.google.gerrit.server.project.ProjectState;
@@ -67,12 +66,14 @@
     PatchSetApproval psa =
         approvalsUtil.getSubmitter(reviewDb.get(), commit.notes(), patchSetId);
     if (psa == null) {
-      throw new MergeValidationException(CommitMergeStatus.NO_PATCH_SET);
+      throw new MergeValidationException(
+          "Missing submitter record for " + patchSetId);
     }
     IdentifiedUser submitter =
         identifiedUserFactory.create(psa.getAccountId());
     if (!submitter.getCapabilities().canAdministrateServer()) {
-      throw new MergeValidationException(CommitMergeStatus.MISSING_DEPENDENCY);
+      throw new MergeValidationException("Submitter " + submitter.getNameEmail()
+          + " is not a site administrator");
     }
   }
 }