Adapt to Project.NameKey refactoring
Change-Id: If1b220fd2a2d33e0a3803a99542078fa07bc7173
diff --git a/java/com/google/gerrit/plugins/checks/api/CreateChecker.java b/java/com/google/gerrit/plugins/checks/api/CreateChecker.java
index c722bfc..ff533a7 100644
--- a/java/com/google/gerrit/plugins/checks/api/CreateChecker.java
+++ b/java/com/google/gerrit/plugins/checks/api/CreateChecker.java
@@ -140,7 +140,7 @@
throw new BadRequestException("repository is required");
}
- ProjectState projectState = projectCache.checkedGet(new Project.NameKey(repository.trim()));
+ ProjectState projectState = projectCache.checkedGet(Project.nameKey(repository.trim()));
if (projectState == null) {
throw new UnprocessableEntityException(String.format("repository %s not found", repository));
}
diff --git a/java/com/google/gerrit/plugins/checks/api/UpdateChecker.java b/java/com/google/gerrit/plugins/checks/api/UpdateChecker.java
index c1dc7f5..6512b69 100644
--- a/java/com/google/gerrit/plugins/checks/api/UpdateChecker.java
+++ b/java/com/google/gerrit/plugins/checks/api/UpdateChecker.java
@@ -129,7 +129,7 @@
throw new BadRequestException("repository cannot be unset");
}
- ProjectState projectState = projectCache.checkedGet(new Project.NameKey(repository.trim()));
+ ProjectState projectState = projectCache.checkedGet(Project.nameKey(repository.trim()));
if (projectState == null) {
throw new UnprocessableEntityException(String.format("repository %s not found", repository));
}
diff --git a/java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java b/java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java
index e506bce..0b2c5ab 100644
--- a/java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java
+++ b/java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java
@@ -204,7 +204,7 @@
"%s.%s is not set in config file for checker %s",
SECTION_NAME, super.keyName, checkerUuid));
}
- checker.setRepository(new Project.NameKey(repository));
+ checker.setRepository(Project.nameKey(repository));
}
@Override
diff --git a/javatests/com/google/gerrit/plugins/checks/CheckerDefinitionTest.java b/javatests/com/google/gerrit/plugins/checks/CheckerDefinitionTest.java
index 1c8c9ab..9d090ce 100644
--- a/javatests/com/google/gerrit/plugins/checks/CheckerDefinitionTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/CheckerDefinitionTest.java
@@ -20,7 +20,7 @@
import com.google.common.collect.ImmutableSortedSet;
import com.google.gerrit.plugins.checks.api.BlockingCondition;
import com.google.gerrit.plugins.checks.api.CheckerStatus;
-import com.google.gerrit.reviewdb.client.Project.NameKey;
+import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.util.time.TimeUtil;
import java.util.EnumSet;
import org.eclipse.jgit.lib.ObjectId;
@@ -50,7 +50,7 @@
private Checker.Builder newChecker() {
return Checker.builder()
- .setRepository(new NameKey("test-repo"))
+ .setRepository(Project.nameKey("test-repo"))
.setStatus(CheckerStatus.ENABLED)
.setUuid(CheckerUuid.parse("schema:any-id"))
.setCreated(TimeUtil.nowTs())
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckOperationsImplTest.java b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckOperationsImplTest.java
index 40d79f8..fb4e0f3 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckOperationsImplTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckOperationsImplTest.java
@@ -88,7 +88,7 @@
CheckerUuid checkerUuid = checkerOperations.newChecker().create();
CheckKey checkKey =
CheckKey.create(
- new Project.NameKey("non-existing"), createChange().getPatchSetId(), checkerUuid);
+ Project.nameKey("non-existing"), createChange().getPatchSetId(), checkerUuid);
exception.expect(IllegalStateException.class);
exception.expectCause(instanceOf(RepositoryNotFoundException.class));
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
index 3d344bf..f81bbae 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
@@ -703,7 +703,7 @@
@Test
public void getCheckersOfNonExistingRepository() throws Exception {
- assertThat(checkerOperations.checkersOf(new Project.NameKey("non-existing"))).isEmpty();
+ assertThat(checkerOperations.checkersOf(Project.nameKey("non-existing"))).isEmpty();
}
@Test
diff --git a/javatests/com/google/gerrit/plugins/checks/db/CheckerConfigTest.java b/javatests/com/google/gerrit/plugins/checks/db/CheckerConfigTest.java
index dece6af..574c2ce 100644
--- a/javatests/com/google/gerrit/plugins/checks/db/CheckerConfigTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/db/CheckerConfigTest.java
@@ -53,12 +53,12 @@
private TestRepository<?> testRepository;
private final CheckerUuid checkerUuid = CheckerUuid.parse("test:my-checker");
- private final Project.NameKey checkerRepository = new Project.NameKey("my-repo");
+ private final Project.NameKey checkerRepository = Project.nameKey("my-repo");
private final TimeZone timeZone = TimeZone.getTimeZone("America/Los_Angeles");
@Before
public void setUp() throws Exception {
- projectName = new Project.NameKey("Test Repository");
+ projectName = Project.nameKey("Test Repository");
repository = new InMemoryRepository(new DfsRepositoryDescription("Test Repository"));
testRepository = new TestRepository<>(repository);
}
@@ -186,7 +186,7 @@
@Test
public void repositoryOfCheckerUpdateOverridesCheckerCreation() throws Exception {
- Project.NameKey anotherRepository = new Project.NameKey("another-repo");
+ Project.NameKey anotherRepository = Project.nameKey("another-repo");
CheckerCreation checkerCreation =
getPrefilledCheckerCreationBuilder().setRepository(checkerRepository).build();
@@ -203,7 +203,7 @@
@Test
public void repositoryOfNewCheckerMustNotBeEmpty() throws Exception {
CheckerCreation checkerCreation =
- getPrefilledCheckerCreationBuilder().setRepository(new Project.NameKey("")).build();
+ getPrefilledCheckerCreationBuilder().setRepository(Project.nameKey("")).build();
CheckerConfig checkerConfig =
CheckerConfig.createForNewChecker(projectName, repository, checkerCreation);
@@ -327,7 +327,7 @@
.build();
createChecker(checkerCreation);
- Project.NameKey newRepository = new Project.NameKey("another-repo");
+ Project.NameKey newRepository = Project.nameKey("another-repo");
CheckerUpdate checkerUpdate = CheckerUpdate.builder().setRepository(newRepository).build();
updateChecker(checkerUuid, checkerUpdate);
@@ -343,7 +343,7 @@
createArbitraryChecker(checkerUuid);
CheckerUpdate checkerUpdate =
- CheckerUpdate.builder().setRepository(new Project.NameKey("")).build();
+ CheckerUpdate.builder().setRepository(Project.nameKey("")).build();
exception.expect(IOException.class);
exception.expectMessage(
@@ -561,7 +561,7 @@
MetaDataUpdate metaDataUpdate =
new MetaDataUpdate(
- GitReferenceUpdated.DISABLED, new Project.NameKey("Test Repository"), repository);
+ GitReferenceUpdated.DISABLED, Project.nameKey("Test Repository"), repository);
metaDataUpdate.getCommitBuilder().setCommitter(serverIdent);
metaDataUpdate.getCommitBuilder().setAuthor(serverIdent);
return metaDataUpdate;
diff --git a/javatests/com/google/gerrit/plugins/checks/db/CheckersByRepositoryNotesTest.java b/javatests/com/google/gerrit/plugins/checks/db/CheckersByRepositoryNotesTest.java
index 59eca92..5263194 100644
--- a/javatests/com/google/gerrit/plugins/checks/db/CheckersByRepositoryNotesTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/db/CheckersByRepositoryNotesTest.java
@@ -51,15 +51,15 @@
@Test
public void getEmptyCheckersList() throws Exception {
CheckersByRepositoryNotes checkersByRepositoryNotes = loadCheckersByRepositoryNotes();
- assertThat(checkersByRepositoryNotes.get(new Project.NameKey("some-project"))).isEmpty();
+ assertThat(checkersByRepositoryNotes.get(Project.nameKey("some-project"))).isEmpty();
}
@Test
public void insertCheckers() throws Exception {
CheckersByRepositoryNotes checkersByRepositoryNotes = loadCheckersByRepositoryNotes();
- Project.NameKey project1 = new Project.NameKey("some-project");
- Project.NameKey project2 = new Project.NameKey("other-project");
+ Project.NameKey project1 = Project.nameKey("some-project");
+ Project.NameKey project2 = Project.nameKey("other-project");
CheckerUuid checkerUuid1 = CheckerUuid.parse("foo:bar");
checkersByRepositoryNotes.insert(checkerUuid1, project1);
@@ -89,7 +89,7 @@
CheckersByRepositoryNotes checkersByRepositoryNotes = loadCheckersByRepositoryNotes();
CheckerUuid checkerUuid = CheckerUuid.parse("foo:bar");
- Project.NameKey project = new Project.NameKey("some-project");
+ Project.NameKey project = Project.nameKey("some-project");
checkersByRepositoryNotes.insert(checkerUuid, project);
commit(checkersByRepositoryNotes);
@@ -106,7 +106,7 @@
public void removeCheckers() throws Exception {
CheckersByRepositoryNotes checkersByRepositoryNotes = loadCheckersByRepositoryNotes();
- Project.NameKey project = new Project.NameKey("some-project");
+ Project.NameKey project = Project.nameKey("some-project");
CheckerUuid checkerUuid1 = CheckerUuid.parse("bar:baz");
CheckerUuid checkerUuid2 = CheckerUuid.parse("foo:bar");
@@ -139,8 +139,8 @@
public void removeNonExistingChecker() throws Exception {
CheckersByRepositoryNotes checkersByRepositoryNotes = loadCheckersByRepositoryNotes();
- Project.NameKey project1 = new Project.NameKey("some-project");
- Project.NameKey project2 = new Project.NameKey("other-project");
+ Project.NameKey project1 = Project.nameKey("some-project");
+ Project.NameKey project2 = Project.nameKey("other-project");
CheckerUuid checkerUuid1 = CheckerUuid.parse("foo:bar");
CheckerUuid checkerUuid2 = CheckerUuid.parse("foo:baz");
@@ -163,8 +163,8 @@
public void updateCheckers() throws Exception {
CheckersByRepositoryNotes checkersByRepositoryNotes = loadCheckersByRepositoryNotes();
- Project.NameKey project1 = new Project.NameKey("some-project");
- Project.NameKey project2 = new Project.NameKey("other-project");
+ Project.NameKey project1 = Project.nameKey("some-project");
+ Project.NameKey project2 = Project.nameKey("other-project");
CheckerUuid checkerUuid1 = CheckerUuid.parse("foo:bar");
CheckerUuid checkerUuid2 = CheckerUuid.parse("foo:baz");
@@ -194,7 +194,7 @@
public void sortOrder() throws Exception {
CheckersByRepositoryNotes checkersByRepositoryNotes = loadCheckersByRepositoryNotes();
- Project.NameKey project = new Project.NameKey("some-project");
+ Project.NameKey project = Project.nameKey("some-project");
CheckerUuid checkerUuid1 = CheckerUuid.parse("foo:bar");
CheckerUuid checkerUuid2 = CheckerUuid.parse("foo:baz");
@@ -221,7 +221,7 @@
CheckersByRepositoryNotes checkersByRepositoryNotes = loadCheckersByRepositoryNotes();
CheckerUuid checkerUuid = CheckerUuid.parse("foo:bar");
- Project.NameKey project = new Project.NameKey("some-project");
+ Project.NameKey project = Project.nameKey("some-project");
checkersByRepositoryNotes.insert(checkerUuid, project);
commit(checkersByRepositoryNotes);
@@ -237,7 +237,7 @@
public void noOpUpdate() throws Exception {
CheckersByRepositoryNotes checkersByRepositoryNotes = loadCheckersByRepositoryNotes();
- Project.NameKey project = new Project.NameKey("some-project");
+ Project.NameKey project = Project.nameKey("some-project");
CheckerUuid checkerUuid1 = CheckerUuid.parse("foo:bar");
checkersByRepositoryNotes.insert(checkerUuid1, project);
@@ -262,7 +262,7 @@
public void getCheckersFromOldRevision() throws Exception {
CheckersByRepositoryNotes checkersByRepositoryNotes = loadCheckersByRepositoryNotes();
- Project.NameKey project = new Project.NameKey("some-project");
+ Project.NameKey project = Project.nameKey("some-project");
CheckerUuid checkerUuid1 = CheckerUuid.parse("foo:bar");
checkersByRepositoryNotes.insert(checkerUuid1, project);
@@ -286,7 +286,7 @@
public void getCheckersFromZeroIdRevision() throws Exception {
assertThat(
CheckersByRepositoryNotes.load(projectName, repository, ObjectId.zeroId())
- .get(new Project.NameKey("some-project")))
+ .get(Project.nameKey("some-project")))
.isEmpty();
}
@@ -294,7 +294,7 @@
public void getCheckersFromNullRevision() throws Exception {
assertThat(
CheckersByRepositoryNotes.load(projectName, repository, null)
- .get(new Project.NameKey("some-project")))
+ .get(Project.nameKey("some-project")))
.isEmpty();
}
@@ -315,7 +315,7 @@
MetaDataUpdate metaDataUpdate =
new MetaDataUpdate(
- GitReferenceUpdated.DISABLED, new Project.NameKey("Test Repository"), repository);
+ GitReferenceUpdated.DISABLED, Project.nameKey("Test Repository"), repository);
metaDataUpdate.getCommitBuilder().setCommitter(serverIdent);
metaDataUpdate.getCommitBuilder().setAuthor(serverIdent);
return metaDataUpdate;
diff --git a/javatests/com/google/gerrit/plugins/checks/rules/ChecksSubmitRuleTest.java b/javatests/com/google/gerrit/plugins/checks/rules/ChecksSubmitRuleTest.java
index 228382f..1fe0b6b 100644
--- a/javatests/com/google/gerrit/plugins/checks/rules/ChecksSubmitRuleTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/rules/ChecksSubmitRuleTest.java
@@ -40,7 +40,7 @@
new ChecksSubmitRule(EasyMock.createStrictMock(Checks.class));
ChangeData cd = EasyMock.createStrictMock(ChangeData.class);
- expect(cd.project()).andReturn(new Project.NameKey("My-Project"));
+ expect(cd.project()).andReturn(Project.nameKey("My-Project"));
expect(cd.getId()).andReturn(new Change.Id(1));
expect(cd.currentPatchSet()).andThrow(new StorageException("Fail for test"));
replay(cd);
@@ -61,7 +61,7 @@
Change.Id changeId = new Change.Id(1);
ChangeData cd = EasyMock.createStrictMock(ChangeData.class);
- expect(cd.project()).andReturn(new Project.NameKey("My-Project"));
+ expect(cd.project()).andReturn(Project.nameKey("My-Project"));
expect(cd.getId()).andReturn(new Change.Id(1));
expect(cd.currentPatchSet()).andReturn(new PatchSet(PatchSet.id(changeId, 1)));
replay(cd);
