commit 768622138f47758ca89b2b57b533908b106783b1
author Dave Borowitz <dborowitz@google.com> Tue Apr 23 13:55:13 2019 -0700
committer Dave Borowitz <dborowitz@google.com> Tue Apr 23 13:55:13 2019 -0700
tree 225a036790c3c1fb002b600ec6e45ca8e76fed2e
parent 143c8add0bacf545a8ff1cad15fa1f4926b4ecef

Adapt to BranchNameKey refactoring

Change-Id: Ie82327e7ae9facbe39cf26752408365e83bd308b

java/com/google/gerrit/plugins/checks/CheckerMergeValidator.java

diff --git a/java/com/google/gerrit/plugins/checks/CheckerMergeValidator.java b/java/com/google/gerrit/plugins/checks/CheckerMergeValidator.java
index dfd16df..a7cad91 100644
--- a/java/com/google/gerrit/plugins/checks/CheckerMergeValidator.java
+++ b/java/com/google/gerrit/plugins/checks/CheckerMergeValidator.java
@@ -14,7 +14,7 @@
 
 package com.google.gerrit.plugins.checks;
 
-import com.google.gerrit.reviewdb.client.Branch;
+import com.google.gerrit.reviewdb.client.BranchNameKey;
 import com.google.gerrit.reviewdb.client.PatchSet;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.config.AllProjectsName;
@@ -39,7 +39,7 @@
       Repository repo,
       CodeReviewCommit commit,
       ProjectState destProject,
-      Branch.NameKey destBranch,
+      BranchNameKey destBranch,
       PatchSet.Id patchSetId,
       IdentifiedUser caller)
       throws MergeValidationException {

javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java

diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java
index c3a9e35..34e92d7 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java
@@ -28,7 +28,7 @@
 import com.google.gerrit.plugins.checks.CheckerRef;
 import com.google.gerrit.plugins.checks.CheckerUuid;
 import com.google.gerrit.plugins.checks.api.CheckerStatus;
-import com.google.gerrit.reviewdb.client.Branch;
+import com.google.gerrit.reviewdb.client.BranchNameKey;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.change.ChangeInserter;
@@ -112,7 +112,7 @@
     String checkerRef = CheckerUuid.parse("foo:bar").toRefName();
 
     allow(checkerRef, Permission.CREATE, adminGroupUuid());
-    createBranch(Branch.nameKey(project, checkerRef));
+    createBranch(BranchNameKey.create(project, checkerRef));
 
     // checker ref can be deleted in any project except All-Projects
     TestRepository<InMemoryRepository> testRepo = cloneProject(project);
@@ -145,7 +145,7 @@
     String checkerRef = CheckerUuid.parse("foo:bar").toRefName();
 
     allow(checkerRef, Permission.CREATE, adminGroupUuid());
-    createBranch(Branch.nameKey(project, checkerRef));
+    createBranch(BranchNameKey.create(project, checkerRef));
 
     TestRepository<InMemoryRepository> repo = cloneProject(project, admin);
     fetch(repo, checkerRef + ":checkerRef");
@@ -186,7 +186,7 @@
     String checkerRef = CheckerUuid.parse("foo:bar").toRefName();
 
     allow(checkerRef, Permission.CREATE, adminGroupUuid());
-    createBranch(Branch.nameKey(project, checkerRef));
+    createBranch(BranchNameKey.create(project, checkerRef));
 
     String changeId = createChangeWithoutCommitValidation(project, checkerRef);
 
@@ -230,7 +230,7 @@
     String checkerRef = CheckerUuid.parse("foo:bar").toRefName();
 
     allow(checkerRef, Permission.CREATE, adminGroupUuid());
-    createBranch(Branch.nameKey(project, checkerRef));
+    createBranch(BranchNameKey.create(project, checkerRef));
 
     TestRepository<InMemoryRepository> repo = cloneProject(project, admin);
     fetch(repo, checkerRef + ":checkerRef");
@@ -269,7 +269,7 @@
     String checkerRef = CheckerUuid.parse("foo:bar").toRefName();
 
     allow(checkerRef, Permission.CREATE, adminGroupUuid());
-    createBranch(Branch.nameKey(project, checkerRef));
+    createBranch(BranchNameKey.create(project, checkerRef));
 
     TestRepository<InMemoryRepository> repo = cloneProject(project, admin);
     fetch(repo, checkerRef + ":checkerRef");