Add constants for Code-Review and Verified labels
Migrate existing usages of "Code-Review" and "Verified" to use the
constants.
Change-Id: I5516cc3ffb46a35afc8ff3e7e080d26c1f91f689
diff --git a/java/com/google/gerrit/entities/LabelId.java b/java/com/google/gerrit/entities/LabelId.java
index 1cc45c8..2426818 100644
--- a/java/com/google/gerrit/entities/LabelId.java
+++ b/java/com/google/gerrit/entities/LabelId.java
@@ -18,7 +18,9 @@
@AutoValue
public abstract class LabelId {
- static final String LEGACY_SUBMIT_NAME = "SUBM";
+ public static final String LEGACY_SUBMIT_NAME = "SUBM";
+ public static final String CODE_REVIEW = "Code-Review";
+ public static final String VERIFIED = "Verified";
public static LabelId create(String n) {
return new AutoValue_LabelId(n);
diff --git a/java/com/google/gerrit/server/git/MergeUtil.java b/java/com/google/gerrit/server/git/MergeUtil.java
index fd1a017..58df343 100644
--- a/java/com/google/gerrit/server/git/MergeUtil.java
+++ b/java/com/google/gerrit/server/git/MergeUtil.java
@@ -641,11 +641,11 @@
}
private static boolean isCodeReview(LabelId id) {
- return "Code-Review".equalsIgnoreCase(id.get());
+ return LabelId.CODE_REVIEW.equalsIgnoreCase(id.get());
}
private static boolean isVerified(LabelId id) {
- return "Verified".equalsIgnoreCase(id.get());
+ return LabelId.VERIFIED.equalsIgnoreCase(id.get());
}
private Iterable<PatchSetApproval> safeGetApprovals(ChangeNotes notes, PatchSet.Id psId) {
diff --git a/java/com/google/gerrit/server/project/testing/TestLabels.java b/java/com/google/gerrit/server/project/testing/TestLabels.java
index 157c746..62f8560 100644
--- a/java/com/google/gerrit/server/project/testing/TestLabels.java
+++ b/java/com/google/gerrit/server/project/testing/TestLabels.java
@@ -15,6 +15,7 @@
package com.google.gerrit.server.project.testing;
import com.google.gerrit.entities.LabelFunction;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.LabelValue;
import java.util.Arrays;
@@ -22,7 +23,7 @@
public class TestLabels {
public static LabelType codeReview() {
return label(
- "Code-Review",
+ LabelId.CODE_REVIEW,
value(2, "Looks good to me, approved"),
value(1, "Looks good to me, but someone else must approve"),
value(0, "No score"),
@@ -31,7 +32,8 @@
}
public static LabelType verified() {
- return label("Verified", value(1, "Verified"), value(0, "No score"), value(-1, "Fails"));
+ return label(
+ LabelId.VERIFIED, value(1, LabelId.VERIFIED), value(0, "No score"), value(-1, "Fails"));
}
public static LabelType patchSetLock() {
diff --git a/java/com/google/gerrit/server/schema/AllUsersCreator.java b/java/com/google/gerrit/server/schema/AllUsersCreator.java
index 90973fb..3588860 100644
--- a/java/com/google/gerrit/server/schema/AllUsersCreator.java
+++ b/java/com/google/gerrit/server/schema/AllUsersCreator.java
@@ -23,6 +23,7 @@
import com.google.gerrit.common.UsedAt;
import com.google.gerrit.common.Version;
import com.google.gerrit.entities.GroupReference;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.RefNames;
@@ -83,7 +84,8 @@
@UsedAt(UsedAt.Project.GOOGLE)
public AllUsersCreator setCodeReviewLabel(LabelType labelType) {
checkArgument(
- labelType.getName().equals("Code-Review"), "label should have 'Code-Review' as its name");
+ labelType.getName().equals(LabelId.CODE_REVIEW),
+ "label should have 'Code-Review' as its name");
this.codeReviewLabel = labelType;
return this;
}
diff --git a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java
index 3430047..8eef58e 100644
--- a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java
+++ b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java
@@ -441,7 +441,6 @@
logger.atFine().log("Setting change %s merged", c.getId());
c.setStatus(Change.Status.MERGED);
c.setSubmissionId(args.submissionId.toString());
-
// TODO(dborowitz): We need to be able to change the author of the message,
// which is not the user from the update context. addMergedMessage was able
// to do this in the past.
