commit 75e72bdd05ea64cf1d71fc147f50a0226cc56f35
author Sven Selberg <svense@axis.com> Wed Jun 10 15:51:40 2020 +0200
committer Sven Selberg <sven.selberg@axis.com> Wed Jun 10 14:17:34 2020 +0000
tree 821ae0b6b368e93f3b1cb0e327abde4ebb8a4f4d
parent c5c4e0e4f5cee487b6c15f2ffab08adee1d4e89f

CheckerRefMigration: Use AllProjectsNameOnInitProvider

AllProjectsName is not bound in init step.

Inspired-by: David Ostrovsky <david@ostrovsky.org>
Bug: Issue 12904
Change-Id: I9525bd125928402e2402ae8643730b08b02d3e28

java/com/google/gerrit/plugins/checks/db/CheckerRefMigration.java

diff --git a/java/com/google/gerrit/plugins/checks/db/CheckerRefMigration.java b/java/com/google/gerrit/plugins/checks/db/CheckerRefMigration.java
index 09e5485..0ab110a 100644
--- a/java/com/google/gerrit/plugins/checks/db/CheckerRefMigration.java
+++ b/java/com/google/gerrit/plugins/checks/db/CheckerRefMigration.java
@@ -13,8 +13,9 @@
 // limitations under the License.
 package com.google.gerrit.plugins.checks.db;
 
+import com.google.gerrit.entities.Project;
+import com.google.gerrit.pgm.init.api.AllProjectsNameOnInitProvider;
 import com.google.gerrit.plugins.checks.CheckerRef;
-import com.google.gerrit.server.config.AllProjectsName;
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -32,16 +33,17 @@
   private static final String LEGACY_REFS_META_CHECKERS = "refs/meta/checkers/";
 
   private final GitRepositoryManager repoManager;
-  private final AllProjectsName allProjectsName;
+  private final AllProjectsNameOnInitProvider allProjectsName;
 
   @Inject
-  CheckerRefMigration(GitRepositoryManager repoManager, AllProjectsName allProjectsName) {
+  CheckerRefMigration(
+      GitRepositoryManager repoManager, AllProjectsNameOnInitProvider allProjectsName) {
     this.repoManager = repoManager;
     this.allProjectsName = allProjectsName;
   }
 
   public void migrate() throws Exception {
-    try (Repository repo = repoManager.openRepository(allProjectsName)) {
+    try (Repository repo = repoManager.openRepository(Project.nameKey(allProjectsName.get()))) {
 
       // This part is specifically for cases where the rename failed half-way last time.
       Ref ref = repo.exactRef(TMP_REF);