Merge branch 'stable-3.2'
* stable-3.2:
CheckerRefMigration: Use AllProjectsNameOnInitProvider
Docs: remove stray single-qoute
Change-Id: I46633b8d12051b3ccc091dd829c67449a4c8461c
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);
diff --git a/resources/Documentation/rest-api-checkers.md b/resources/Documentation/rest-api-checkers.md
index f05816f..534a479 100644
--- a/resources/Documentation/rest-api-checkers.md
+++ b/resources/Documentation/rest-api-checkers.md
@@ -107,7 +107,7 @@
* `name`: Can be unset by setting an empty string ("") for it.
* `description`: Can be unset by setting an empty string ("") for it.
* `url`: Can be unset by setting an empty string ("") for it.
-* '`repository`: Cannot be unset. Attempting to set it to an empty string ("")
+* `repository`: Cannot be unset. Attempting to set it to an empty string ("")
or a string that is empty after trim is rejected as `400 Bad Request`.
* `status`: Cannot be unset.
* `blocking`: Can be unset by setting an empty list (\[\]) for it.
