commit f33acffa8b07064c4b582cc7af6a94616bdd3d50
author Dave Borowitz <dborowitz@google.com> Wed Apr 17 15:53:59 2019 -0700
committer David Pursehouse <dpursehouse@collab.net> Tue Apr 23 11:05:33 2019 +0900
tree 667fea33dd84d18a59e02a053c27b0c9df7e4b8d
parent 26903628f90b48a6cf3c59989ec5a95b40c2e8f8

Adapt to Branch.NameKey refactoring

Change-Id: I453c0ee540b9dc44ac46214e284713933829a245

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 d90d321..dfd16df 100644
--- a/java/com/google/gerrit/plugins/checks/CheckerMergeValidator.java
+++ b/java/com/google/gerrit/plugins/checks/CheckerMergeValidator.java
@@ -44,7 +44,7 @@
       IdentifiedUser caller)
       throws MergeValidationException {
     if (!allProjectsName.equals(destProject.getNameKey())
-        || !CheckerRef.isRefsCheckers(destBranch.get())) {
+        || !CheckerRef.isRefsCheckers(destBranch.branch())) {
       return;
     }
 

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 d4454c1..0f0ea70 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java
@@ -112,7 +112,7 @@
     String checkerRef = CheckerUuid.parse("foo:bar").toRefName();
 
     allow(checkerRef, Permission.CREATE, adminGroupUuid());
-    createBranch(new Branch.NameKey(project, checkerRef));
+    createBranch(Branch.nameKey(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(new Branch.NameKey(project, checkerRef));
+    createBranch(Branch.nameKey(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(new Branch.NameKey(project, checkerRef));
+    createBranch(Branch.nameKey(project, checkerRef));
 
     String changeId = createChangeWithoutCommitValidation(project, checkerRef);
 
@@ -230,7 +230,7 @@
     String checkerRef = CheckerUuid.parse("foo:bar").toRefName();
 
     allow(checkerRef, Permission.CREATE, adminGroupUuid());
-    createBranch(new Branch.NameKey(project, checkerRef));
+    createBranch(Branch.nameKey(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(new Branch.NameKey(project, checkerRef));
+    createBranch(Branch.nameKey(project, checkerRef));
 
     TestRepository<InMemoryRepository> repo = cloneProject(project, admin);
     fetch(repo, checkerRef + ":checkerRef");