Adapt to PatchSet.Id refactoring
Change-Id: I3be6c928a4560c9bd40e4a4da701715d18fe7311
diff --git a/java/com/google/gerrit/plugins/checks/CheckJson.java b/java/com/google/gerrit/plugins/checks/CheckJson.java
index 3ef8937..e4199e9 100644
--- a/java/com/google/gerrit/plugins/checks/CheckJson.java
+++ b/java/com/google/gerrit/plugins/checks/CheckJson.java
@@ -61,9 +61,9 @@
public CheckInfo format(Check check) throws IOException {
CheckInfo info = new CheckInfo();
info.checkerUuid = check.key().checkerUuid().get();
- info.changeNumber = check.key().patchSet().changeId.id;
+ info.changeNumber = check.key().patchSet().changeId().get();
info.repository = check.key().repository().get();
- info.patchSetId = check.key().patchSet().patchSetId;
+ info.patchSetId = check.key().patchSet().get();
info.state = check.state();
info.message = check.message().orElse(null);
diff --git a/java/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckOperationsImpl.java b/java/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckOperationsImpl.java
index 9d28a48..8982df5 100644
--- a/java/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckOperationsImpl.java
+++ b/java/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckOperationsImpl.java
@@ -92,7 +92,7 @@
try (Repository repo = repoManager.openRepository(key.repository());
RevWalk rw = new RevWalk(repo)) {
Ref checkRef =
- repo.getRefDatabase().exactRef(CheckerRef.checksRef(key.patchSet().changeId));
+ repo.getRefDatabase().exactRef(CheckerRef.checksRef(key.patchSet().changeId()));
checkNotNull(checkRef);
NoteMap notes = NoteMap.read(rw.getObjectReader(), rw.parseCommit(checkRef.getObjectId()));
diff --git a/java/com/google/gerrit/plugins/checks/api/ChecksFactory.java b/java/com/google/gerrit/plugins/checks/api/ChecksFactory.java
index e6ae0a1..1367222 100644
--- a/java/com/google/gerrit/plugins/checks/api/ChecksFactory.java
+++ b/java/com/google/gerrit/plugins/checks/api/ChecksFactory.java
@@ -60,7 +60,7 @@
}
public Checks revision(PatchSet.Id patchSetId) throws RestApiException {
- ChangeResource changeResource = getChangeResource(patchSetId.getParentKey());
+ ChangeResource changeResource = getChangeResource(patchSetId.changeId());
PatchSet patchSet = getPatchSet(changeResource.getNotes(), patchSetId);
return getChecks(changeResource, patchSet);
}
diff --git a/java/com/google/gerrit/plugins/checks/api/QueryPendingChecks.java b/java/com/google/gerrit/plugins/checks/api/QueryPendingChecks.java
index a620493..92b1366 100644
--- a/java/com/google/gerrit/plugins/checks/api/QueryPendingChecks.java
+++ b/java/com/google/gerrit/plugins/checks/api/QueryPendingChecks.java
@@ -220,7 +220,7 @@
pendingChecksInfo.patchSet = new CheckablePatchSetInfo();
pendingChecksInfo.patchSet.repository = repositoryName.get();
- pendingChecksInfo.patchSet.changeNumber = patchSet.getId().getParentKey().get();
+ pendingChecksInfo.patchSet.changeNumber = patchSet.getId().changeId().get();
pendingChecksInfo.patchSet.patchSetId = patchSet.getPatchSetId();
pendingChecksInfo.pendingChecks =
diff --git a/java/com/google/gerrit/plugins/checks/db/NoteDbChecks.java b/java/com/google/gerrit/plugins/checks/db/NoteDbChecks.java
index 69c8665..5a38bfd 100644
--- a/java/com/google/gerrit/plugins/checks/db/NoteDbChecks.java
+++ b/java/com/google/gerrit/plugins/checks/db/NoteDbChecks.java
@@ -88,7 +88,7 @@
if (!result.isPresent() && options.backfillChecks()) {
ChangeData changeData =
- changeDataFactory.create(checkKey.repository(), checkKey.patchSet().getParentKey());
+ changeDataFactory.create(checkKey.repository(), checkKey.patchSet().changeId());
return checkBackfiller.getBackfilledCheckForRelevantChecker(
checkKey.checkerUuid(), changeData, checkKey.patchSet());
}
@@ -100,7 +100,7 @@
Project.NameKey repositoryName, PatchSet.Id psId, GetCheckOptions options)
throws StorageException, IOException {
// TODO(gerrit-team): Instead of reading the complete notes map, read just one note.
- ChangeData changeData = changeDataFactory.create(repositoryName, psId.getParentKey());
+ ChangeData changeData = changeDataFactory.create(repositoryName, psId.changeId());
PatchSet patchSet = changeData.patchSet(psId);
CheckNotes checkNotes = checkNotesFactory.create(changeData.change());
checkNotes.load();
@@ -128,7 +128,7 @@
@Override
public CombinedCheckState getCombinedCheckState(NameKey projectName, Id patchSetId)
throws IOException, StorageException {
- ChangeData changeData = changeDataFactory.create(projectName, patchSetId.changeId);
+ ChangeData changeData = changeDataFactory.create(projectName, patchSetId.changeId());
CheckerQuery checkerQuery = checkerQueryProvider.get();
ImmutableMap<String, Checker> allCheckersOfProject =
checkers.checkersOf(projectName).stream()
diff --git a/java/com/google/gerrit/plugins/checks/db/NoteDbChecksUpdate.java b/java/com/google/gerrit/plugins/checks/db/NoteDbChecksUpdate.java
index fe00c4d..b473a6a 100644
--- a/java/com/google/gerrit/plugins/checks/db/NoteDbChecksUpdate.java
+++ b/java/com/google/gerrit/plugins/checks/db/NoteDbChecksUpdate.java
@@ -163,7 +163,7 @@
try (Repository repo = repoManager.openRepository(checkKey.repository());
ObjectInserter objectInserter = repo.newObjectInserter();
RevWalk rw = new RevWalk(repo)) {
- Ref checkRef = repo.getRefDatabase().exactRef(checksRef(checkKey.patchSet().getParentKey()));
+ Ref checkRef = repo.getRefDatabase().exactRef(checksRef(checkKey.patchSet().changeId()));
ObjectId parent = checkRef == null ? ObjectId.zeroId() : checkRef.getObjectId();
CommitBuilder cb;
String message;
@@ -185,7 +185,7 @@
ObjectId newCommitId = objectInserter.insert(cb);
objectInserter.flush();
- String refName = CheckerRef.checksRef(checkKey.patchSet().getParentKey());
+ String refName = CheckerRef.checksRef(checkKey.patchSet().changeId());
RefUpdate refUpdate = repo.updateRef(refName);
refUpdate.setExpectedOldObjectId(parent);
refUpdate.setNewObjectId(newCommitId);
diff --git a/java/com/google/gerrit/plugins/checks/testing/PendingChecksInfoSubject.java b/java/com/google/gerrit/plugins/checks/testing/PendingChecksInfoSubject.java
index a8151a0..3183271 100644
--- a/java/com/google/gerrit/plugins/checks/testing/PendingChecksInfoSubject.java
+++ b/java/com/google/gerrit/plugins/checks/testing/PendingChecksInfoSubject.java
@@ -45,7 +45,7 @@
CheckablePatchSetInfo patchSet = patchSet();
check("patchSet().changeNumber()")
.that(patchSet.changeNumber)
- .isEqualTo(expectedPatchSetId.getParentKey().get());
+ .isEqualTo(expectedPatchSetId.changeId().get());
check("patchSet().id()").that(patchSet.patchSetId).isEqualTo(expectedPatchSetId.get());
}
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/ChecksRefIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/ChecksRefIT.java
index b73c78f..e7f3b31 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/ChecksRefIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/ChecksRefIT.java
@@ -40,10 +40,10 @@
CheckerUuid checkerUuid = checkerOperations.newChecker().repository(project).create();
CheckKey checkKey = CheckKey.create(project, patchSetId, checkerUuid);
checkOperations.newCheck(checkKey).state(CheckState.NOT_STARTED).upsert();
- String noteDbChecksRef = CheckerRef.checksRef(patchSetId.getParentKey());
+ String noteDbChecksRef = CheckerRef.checksRef(patchSetId.changeId());
assertThat(projectOperations.project(project).hasHead(noteDbChecksRef)).isTrue();
- gApi.changes().id(patchSetId.getParentKey().get()).delete();
+ gApi.changes().id(patchSetId.changeId().get()).delete();
assertThat(projectOperations.project(project).hasHead(noteDbChecksRef)).isFalse();
}
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/ChecksRestApiBindingsIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/ChecksRestApiBindingsIT.java
index f89bec0..557aab0 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/ChecksRestApiBindingsIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/ChecksRestApiBindingsIT.java
@@ -69,8 +69,8 @@
RestApiCallHelper.execute(
adminRestSession,
CHECK_ENDPOINTS,
- String.valueOf(key.patchSet().changeId.id),
- String.valueOf(key.patchSet().patchSetId));
+ String.valueOf(key.patchSet().changeId().get()),
+ String.valueOf(key.patchSet().get()));
}
@Test
@@ -81,8 +81,8 @@
RestApiCallHelper.execute(
adminRestSession,
SCOPED_CHECK_ENDPOINTS,
- String.valueOf(key.patchSet().changeId.id),
- String.valueOf(key.patchSet().patchSetId),
+ String.valueOf(key.patchSet().changeId().get()),
+ String.valueOf(key.patchSet().get()),
checkerUuid.get());
}
@@ -92,7 +92,7 @@
RestApiCallHelper.execute(
adminRestSession,
RestCall.post("/changes/%s/revisions/%s/checks~checks/"),
- String.valueOf(patchSetId.changeId.id),
- String.valueOf(patchSetId.patchSetId));
+ String.valueOf(patchSetId.changeId().get()),
+ String.valueOf(patchSetId.get()));
}
}
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ChangeCheckInfoIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ChangeCheckInfoIT.java
index 66b360a..e95fce3 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ChangeCheckInfoIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ChangeCheckInfoIT.java
@@ -42,7 +42,7 @@
@Before
public void setUp() throws Exception {
psId = createChange().getPatchSetId();
- changeId = psId.getParentKey();
+ changeId = psId.changeId();
}
@Test
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckIT.java
index f2eb4e5..b725cd1 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckIT.java
@@ -59,7 +59,8 @@
TestTimeUtil.setClock(Timestamp.from(Instant.EPOCH));
patchSetId = createChange().getPatchSetId();
- revId = new RevId(gApi.changes().id(patchSetId.changeId.get()).current().commit(false).commit);
+ revId =
+ new RevId(gApi.changes().id(patchSetId.changeId().get()).current().commit(false).commit);
}
@After
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java
index 7a9be4b..d9e5ff7 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java
@@ -120,7 +120,7 @@
adminRestSession.get(
String.format(
"/changes/%s/revisions/%s/checks~checks/%s?o=CHECKER",
- patchSetId.getParentKey().get(), patchSetId.get(), checkerUuid.get()));
+ patchSetId.changeId().get(), patchSetId.get(), checkerUuid.get()));
r.assertOK();
CheckInfo checkInfo =
newGson().fromJson(r.getReader(), new TypeToken<CheckInfo>() {}.getType());
@@ -131,7 +131,7 @@
adminRestSession.get(
String.format(
"/changes/%s/revisions/%s/checks~checks/%s?O=1",
- patchSetId.getParentKey().get(), patchSetId.get(), checkerUuid.get()));
+ patchSetId.changeId().get(), patchSetId.get(), checkerUuid.get()));
r.assertOK();
checkInfo = newGson().fromJson(r.getReader(), new TypeToken<CheckInfo>() {}.getType());
r.consume();
@@ -158,9 +158,9 @@
checkOperations.newCheck(checkKey).upsert();
assertThat(getCheckInfo(patchSetId, checkerUuid).changeNumber)
- .isEqualTo(patchSetId.getParentKey().get());
+ .isEqualTo(patchSetId.changeId().get());
assertThat(getCheckInfo(patchSetId, checkerUuid, ListChecksOption.CHECKER).changeNumber)
- .isEqualTo(patchSetId.getParentKey().get());
+ .isEqualTo(patchSetId.changeId().get());
}
@Test
@@ -301,7 +301,7 @@
// empty CheckInfo.
assertThat(check.repository).isEqualTo(project.get());
assertThat(check.checkerUuid).isEqualTo(checkerUuid.get());
- assertThat(check.changeNumber).isEqualTo(patchSetId.getParentKey().get());
+ assertThat(check.changeNumber).isEqualTo(patchSetId.changeId().get());
assertThat(check.patchSetId).isEqualTo(patchSetId.get());
assertThat(check.state).isEqualTo(CheckState.RUNNING);
}
@@ -395,11 +395,7 @@
// get check for the current patch set (2 ways)
assertThat(checksApiFactory.revision(currentPatchSetId).id(checkerUuid).get())
.isEqualTo(checkOperations.check(checkKey2).asInfo());
- assertThat(
- checksApiFactory
- .currentRevision(currentPatchSetId.getParentKey())
- .id(checkerUuid)
- .get())
+ assertThat(checksApiFactory.currentRevision(currentPatchSetId.changeId()).id(checkerUuid).get())
.isEqualTo(checkOperations.check(checkKey2).asInfo());
}
@@ -423,7 +419,7 @@
@Test
public void getNonExistingCheckBackfillsForRelevantChecker() throws Exception {
String topic = name("topic");
- Change.Id changeId = patchSetId.getParentKey();
+ Change.Id changeId = patchSetId.changeId();
CheckerUuid checkerUuid =
checkerOperations.newChecker().repository(project).query("topic:" + topic).create();
CheckKey checkKey = CheckKey.create(project, patchSetId, checkerUuid);
@@ -435,7 +431,7 @@
Timestamp psCreated = getPatchSetCreated(changeId);
CheckInfo expected = new CheckInfo();
expected.repository = checkKey.repository().get();
- expected.changeNumber = checkKey.patchSet().getParentKey().get();
+ expected.changeNumber = checkKey.patchSet().changeId().get();
expected.patchSetId = checkKey.patchSet().get();
expected.checkerUuid = checkKey.checkerUuid().get();
expected.state = CheckState.NOT_STARTED;
@@ -446,14 +442,14 @@
@Test
public void getNonExistingCheckDoesNotBackfillForDisabledChecker() throws Exception {
- Change.Id changeId = patchSetId.getParentKey();
+ Change.Id changeId = patchSetId.changeId();
CheckerUuid checkerUuid = checkerOperations.newChecker().repository(project).create();
CheckKey checkKey = CheckKey.create(project, patchSetId, checkerUuid);
Timestamp psCreated = getPatchSetCreated(changeId);
CheckInfo expected = new CheckInfo();
expected.repository = checkKey.repository().get();
- expected.changeNumber = checkKey.patchSet().getParentKey().get();
+ expected.changeNumber = checkKey.patchSet().changeId().get();
expected.patchSetId = checkKey.patchSet().get();
expected.checkerUuid = checkKey.checkerUuid().get();
expected.state = CheckState.NOT_STARTED;
@@ -481,7 +477,7 @@
.expectedResponseCode(SC_BAD_REQUEST)
.expectedMessage("invalid checker UUID: " + CheckerTestData.INVALID_UUID)
.build(),
- Integer.toString(patchSetId.getParentKey().get()),
+ Integer.toString(patchSetId.changeId().get()),
Integer.toString(patchSetId.get()),
CheckerTestData.INVALID_UUID);
}
@@ -512,7 +508,7 @@
CheckKey checkKey = CheckKey.create(project, patchSetId, checkerUuid);
checkOperations.newCheck(checkKey).upsert();
- gApi.changes().id(patchSetId.getParentKey().get()).delete();
+ gApi.changes().id(patchSetId.changeId().get()).delete();
try {
getCheckInfo(patchSetId, checkerUuid);
@@ -521,7 +517,7 @@
assertThat(e)
.hasMessageThat()
.ignoringCase()
- .contains(String.format("change %d", patchSetId.getParentKey().get()));
+ .contains(String.format("change %d", patchSetId.changeId().get()));
}
}
@@ -555,7 +551,7 @@
private PatchSet.Id createPatchSet() throws Exception {
PushOneCommit.Result r = amendChange(changeId);
PatchSet.Id currentPatchSetId = r.getPatchSetId();
- assertThat(patchSetId.changeId).isEqualTo(currentPatchSetId.changeId);
+ assertThat(patchSetId.changeId()).isEqualTo(currentPatchSetId.changeId());
assertThat(patchSetId.get()).isLessThan(currentPatchSetId.get());
return currentPatchSetId;
}
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListChecksIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListChecksIT.java
index 59b5561..bf12827 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListChecksIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListChecksIT.java
@@ -127,7 +127,7 @@
adminRestSession.get(
String.format(
"/changes/%s/revisions/%s/checks~checks/?o=CHECKER",
- patchSetId.getParentKey().get(), patchSetId.get()));
+ patchSetId.changeId().get(), patchSetId.get()));
r.assertOK();
List<CheckInfo> checkInfos =
newGson().fromJson(r.getReader(), new TypeToken<List<CheckInfo>>() {}.getType());
@@ -138,7 +138,7 @@
adminRestSession.get(
String.format(
"/changes/%s/revisions/%s/checks~checks/?O=1",
- patchSetId.getParentKey().get(), patchSetId.get()));
+ patchSetId.changeId().get(), patchSetId.get()));
r.assertOK();
checkInfos = newGson().fromJson(r.getReader(), new TypeToken<List<CheckInfo>>() {}.getType());
r.consume();
@@ -234,12 +234,12 @@
assertThat(checksApiFactory.revision(patchSetId).list()).isEmpty();
// Update change to match checker's query.
- gApi.changes().id(patchSetId.getParentKey().get()).topic(topic);
+ gApi.changes().id(patchSetId.changeId().get()).topic(topic);
- Timestamp psCreated = getPatchSetCreated(patchSetId.getParentKey());
+ Timestamp psCreated = getPatchSetCreated(patchSetId.changeId());
CheckInfo checkInfo = new CheckInfo();
checkInfo.repository = project.get();
- checkInfo.changeNumber = patchSetId.getParentKey().get();
+ checkInfo.changeNumber = patchSetId.changeId().get();
checkInfo.patchSetId = patchSetId.get();
checkInfo.checkerUuid = checkerUuid.get();
checkInfo.state = CheckState.NOT_STARTED;
@@ -253,10 +253,10 @@
CheckerUuid checkerUuid = checkerOperations.newChecker().repository(project).create();
CheckKey checkKey = CheckKey.create(project, patchSetId, checkerUuid);
- Timestamp psCreated = getPatchSetCreated(patchSetId.getParentKey());
+ Timestamp psCreated = getPatchSetCreated(patchSetId.changeId());
CheckInfo checkInfo = new CheckInfo();
checkInfo.repository = checkKey.repository().get();
- checkInfo.changeNumber = checkKey.patchSet().getParentKey().get();
+ checkInfo.changeNumber = checkKey.patchSet().changeId().get();
checkInfo.patchSetId = checkKey.patchSet().get();
checkInfo.checkerUuid = checkKey.checkerUuid().get();
checkInfo.state = CheckState.NOT_STARTED;
@@ -291,7 +291,7 @@
.containsExactly(checkOperations.check(checkKey1).asInfo());
// list checks for the new patch set (2 ways)
- assertThat(checksApiFactory.currentRevision(currentPatchSet.getParentKey()).list())
+ assertThat(checksApiFactory.currentRevision(currentPatchSet.changeId()).list())
.containsExactly(checkOperations.check(checkKey2).asInfo());
assertThat(checksApiFactory.revision(currentPatchSet).list())
.containsExactly(checkOperations.check(checkKey2).asInfo());
@@ -336,7 +336,7 @@
private PatchSet.Id createPatchSet() throws Exception {
PushOneCommit.Result r = amendChange(changeId);
PatchSet.Id currentPatchSetId = r.getPatchSetId();
- assertThat(patchSetId.changeId).isEqualTo(currentPatchSetId.changeId);
+ assertThat(patchSetId.changeId()).isEqualTo(currentPatchSetId.changeId());
assertThat(patchSetId.get()).isLessThan(currentPatchSetId.get());
return currentPatchSetId;
}
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/QueryPendingChecksIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/QueryPendingChecksIT.java
index 5994171..ca1e1a2 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/QueryPendingChecksIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/QueryPendingChecksIT.java
@@ -477,7 +477,7 @@
queryPendingChecks(checkerUuid, CheckState.NOT_STARTED);
assertThat(pendingChecksList).hasSize(2);
- gApi.changes().id(patchSetId2.getParentKey().toString()).abandon();
+ gApi.changes().id(patchSetId2.changeId().toString()).abandon();
pendingChecksList = queryPendingChecks(checkerUuid, CheckState.NOT_STARTED);
assertThat(pendingChecksList).hasSize(1);
@@ -504,7 +504,7 @@
queryPendingChecks(checkerUuid, CheckState.NOT_STARTED);
assertThat(pendingChecksList).hasSize(2);
- gApi.changes().id(patchSetId2.getParentKey().toString()).abandon();
+ gApi.changes().id(patchSetId2.changeId().toString()).abandon();
pendingChecksList = queryPendingChecks(checkerUuid, CheckState.NOT_STARTED);
assertThat(pendingChecksList).hasSize(2);
@@ -605,7 +605,7 @@
@Test
public void pendingChecksDontIncludeChecksForPrivateChangesOfOtherUsers() throws Exception {
// make change private so that it is only visible to the admin user
- gApi.changes().id(patchSetId.getParentKey().get()).setPrivate(true);
+ gApi.changes().id(patchSetId.changeId().get()).setPrivate(true);
CheckerUuid checkerUuid = checkerOperations.newChecker().repository(project).create();
checkOperations
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 b3166b6..40d79f8 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckOperationsImplTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckOperationsImplTest.java
@@ -68,7 +68,7 @@
CheckInfo foundCheck = getCheckFromServer(checkKey);
assertThat(foundCheck.repository).isEqualTo(project.get());
- assertThat(foundCheck.changeNumber).isEqualTo(checkKey.patchSet().getParentKey().get());
+ assertThat(foundCheck.changeNumber).isEqualTo(checkKey.patchSet().changeId().get());
assertThat(foundCheck.patchSetId).isEqualTo(checkKey.patchSet().get());
assertThat(foundCheck.checkerUuid).isEqualTo(checkerUuid.get());
assertThat(foundCheck.state).isNotNull();
@@ -98,7 +98,7 @@
@Test
public void checkCannotBeCreatedForNonExistingPatchSet() throws Exception {
CheckerUuid checkerUuid = checkerOperations.newChecker().create();
- CheckKey checkKey = CheckKey.create(project, new PatchSet.Id(new Change.Id(1), 1), checkerUuid);
+ CheckKey checkKey = CheckKey.create(project, PatchSet.id(new Change.Id(1), 1), checkerUuid);
exception.expect(IllegalStateException.class);
exception.expectCause(instanceOf(IOException.class));
@@ -125,7 +125,7 @@
CheckInfo foundCheck = getCheckFromServer(checkKey);
assertThat(foundCheck.repository).isEqualTo(project.get());
- assertThat(foundCheck.changeNumber).isEqualTo(checkKey.patchSet().getParentKey().get());
+ assertThat(foundCheck.changeNumber).isEqualTo(checkKey.patchSet().changeId().get());
assertThat(foundCheck.patchSetId).isEqualTo(checkKey.patchSet().get());
assertThat(foundCheck.checkerUuid).isEqualTo(checkerUuid.get());
}
@@ -502,7 +502,7 @@
RevWalk rw = new RevWalk(repo);
ObjectReader reader = repo.newObjectReader()) {
Ref checkRef =
- repo.getRefDatabase().exactRef(CheckerRef.checksRef(checkKey.patchSet().changeId));
+ repo.getRefDatabase().exactRef(CheckerRef.checksRef(checkKey.patchSet().changeId()));
checkNotNull(checkRef);
NoteMap notes = NoteMap.read(reader, rw.parseCommit(checkRef.getObjectId()));
@@ -527,7 +527,7 @@
Check check = checkOperations.check(checkKey).get();
CheckInfo checkInfo = checkOperations.check(checkKey).asInfo();
assertThat(checkInfo.repository).isEqualTo(check.key().repository().get());
- assertThat(checkInfo.changeNumber).isEqualTo(check.key().patchSet().getParentKey().get());
+ assertThat(checkInfo.changeNumber).isEqualTo(check.key().patchSet().changeId().get());
assertThat(checkInfo.patchSetId).isEqualTo(check.key().patchSet().get());
assertThat(checkInfo.checkerUuid).isEqualTo(check.key().checkerUuid().get());
assertThat(checkInfo.state).isEqualTo(check.state());
@@ -563,7 +563,7 @@
private RevId getRevId(PatchSet.Id patchSetId) throws Exception {
return new RevId(
gApi.changes()
- .id(patchSetId.changeId.get())
+ .id(patchSetId.changeId().get())
.revision(patchSetId.get())
.commit(false)
.commit);
diff --git a/javatests/com/google/gerrit/plugins/checks/rules/ChecksSubmitRuleTest.java b/javatests/com/google/gerrit/plugins/checks/rules/ChecksSubmitRuleTest.java
index 43a5090..228382f 100644
--- a/javatests/com/google/gerrit/plugins/checks/rules/ChecksSubmitRuleTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/rules/ChecksSubmitRuleTest.java
@@ -63,7 +63,7 @@
ChangeData cd = EasyMock.createStrictMock(ChangeData.class);
expect(cd.project()).andReturn(new Project.NameKey("My-Project"));
expect(cd.getId()).andReturn(new Change.Id(1));
- expect(cd.currentPatchSet()).andReturn(new PatchSet(new PatchSet.Id(changeId, 1)));
+ expect(cd.currentPatchSet()).andReturn(new PatchSet(PatchSet.id(changeId, 1)));
replay(cd);
Collection<SubmitRecord> submitRecords =
