From 766a93d2a0a2c0edd8657968caf187001a4c47fb Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Fri, 19 Apr 2019 08:44:05 -0700 Subject: [PATCH] Convert PatchSet.Id to AutoValue See I6982fb24 for context. Change-Id: I681421e2e3415125dc4db44c7f3bf32d37920166 --- .../gerrit/acceptance/AbstractDaemonTest.java | 4 +- java/com/google/gerrit/common/PageLinks.java | 2 +- .../gerrit/common/data/CommentDetail.java | 2 +- .../google/gerrit/httpd/raw/CatServlet.java | 2 +- .../google/gerrit/reviewdb/client/Change.java | 4 +- .../google/gerrit/reviewdb/client/Patch.java | 2 +- .../reviewdb/client/PatchLineComment.java | 2 +- .../gerrit/reviewdb/client/PatchSet.java | 86 +++++++++---------- .../converter/ChangeProtoConverter.java | 2 +- .../converter/PatchSetIdProtoConverter.java | 6 +- .../gerrit/server/ChangeMessagesUtil.java | 5 +- java/com/google/gerrit/server/ChangeUtil.java | 6 +- .../google/gerrit/server/CommentsUtil.java | 4 +- .../google/gerrit/server/PatchSetUtil.java | 2 +- .../gerrit/server/PublishCommentUtil.java | 2 +- .../com/google/gerrit/server/ReviewerSet.java | 6 +- .../gerrit/server/change/ChangeInserter.java | 2 +- .../server/change/ConsistencyChecker.java | 7 +- .../gerrit/server/change/DeleteChangeOp.java | 2 +- .../gerrit/server/change/LabelNormalizer.java | 2 +- .../gerrit/server/change/RebaseChangeOp.java | 4 +- .../gerrit/server/change/RebaseUtil.java | 4 +- .../gerrit/server/edit/ChangeEditUtil.java | 4 +- .../gerrit/server/events/EventBroker.java | 3 +- .../server/extensions/events/EventUtil.java | 2 +- .../gerrit/server/git/CodeReviewCommit.java | 2 +- .../gerrit/server/git/GroupCollector.java | 2 +- .../google/gerrit/server/git/MergeUtil.java | 2 +- .../gerrit/server/git/MergedByPushOp.java | 2 +- .../server/git/receive/ReceiveCommits.java | 8 +- .../git/validators/MergeValidators.java | 3 +- .../server/mail/receive/MailProcessor.java | 4 +- .../gerrit/server/mail/send/ChangeEmail.java | 2 +- .../server/notedb/AbstractChangeUpdate.java | 2 +- .../server/notedb/ChangeNotesParser.java | 7 +- .../server/notedb/ChangeNotesState.java | 2 +- .../server/notedb/LegacyChangeNoteRead.java | 4 +- .../server/patch/PatchScriptFactory.java | 12 +-- .../server/query/change/ChangeData.java | 2 +- .../restapi/account/DeleteDraftComments.java | 2 +- .../restapi/change/DeleteDraftComment.java | 2 +- .../gerrit/server/restapi/change/GetDiff.java | 2 +- .../server/restapi/change/GetRelated.java | 2 +- .../restapi/change/PutDraftComment.java | 2 +- .../gerrit/server/restapi/change/Rebase.java | 2 +- .../restapi/change/RelatedChangesSorter.java | 2 +- .../server/restapi/change/Revisions.java | 5 +- .../restapi/project/CreateAccessChange.java | 3 +- .../schema/JdbcAccountPatchReviewStore.java | 12 +-- .../server/submit/SubmitStrategyListener.java | 2 +- .../gerrit/sshd/commands/PatchSetParser.java | 2 +- .../gerrit/sshd/commands/ReviewCommand.java | 6 +- .../google/gerrit/testing/TestChanges.java | 2 +- .../acceptance/git/PushPermissionsIT.java | 2 +- .../acceptance/git/RefAdvertisementIT.java | 4 +- .../gerrit/acceptance/git/SubmitOnPushIT.java | 6 +- .../PluginProvidedChildRestApiBindingsIT.java | 4 +- .../rest/change/AbstractSubmit.java | 6 +- .../acceptance/rest/change/ActionsIT.java | 2 +- .../rest/change/SubmitByFastForwardIT.java | 2 +- .../change/SubmitByMergeIfNecessaryIT.java | 2 +- .../rest/change/SubmitByRebaseAlwaysIT.java | 2 +- .../server/change/ConsistencyCheckerIT.java | 14 +-- .../server/change/GetRelatedIT.java | 18 ++-- .../gerrit/common/data/LabelFunctionTest.java | 2 +- .../reviewdb/client/PatchSetApprovalTest.java | 6 +- .../gerrit/reviewdb/client/PatchSetTest.java | 14 ++- .../gerrit/reviewdb/client/PatchTest.java | 4 +- .../gerrit/reviewdb/client/RefNamesTest.java | 2 +- .../ChangeMessageProtoConverterTest.java | 12 +-- .../converter/ChangeProtoConverterTest.java | 8 +- ...PatchSetApprovalKeyProtoConverterTest.java | 8 +- .../PatchSetApprovalProtoConverterTest.java | 26 ++---- .../PatchSetIdProtoConverterTest.java | 14 +-- .../converter/PatchSetProtoConverterTest.java | 14 +-- .../gerrit/server/change/WalkSorterTest.java | 4 +- .../gerrit/server/edit/ChangeEditTest.java | 2 +- .../gerrit/server/git/GroupCollectorTest.java | 2 +- .../server/notedb/ChangeNotesStateTest.java | 15 ++-- .../gerrit/server/notedb/ChangeNotesTest.java | 10 +-- .../change/AbstractQueryChangesTest.java | 4 +- .../server/query/change/ChangeDataTest.java | 4 +- .../rules/IgnoreSelfApprovalRuleTest.java | 2 +- .../gerrit/server/update/BatchUpdateTest.java | 8 +- plugins/reviewnotes | 2 +- proto/entities.proto | 2 +- 86 files changed, 235 insertions(+), 259 deletions(-) diff --git a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java index b201b65cf7..8c4f30ba4c 100644 --- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java +++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java @@ -1087,7 +1087,7 @@ public abstract class AbstractDaemonTest { } protected PatchSet getPatchSet(PatchSet.Id psId) { - return changeDataFactory.create(project, psId.getParentKey()).patchSet(psId); + return changeDataFactory.create(project, psId.changeId()).patchSet(psId); } protected IdentifiedUser user(TestAccount testAccount) { @@ -1107,7 +1107,7 @@ public abstract class AbstractDaemonTest { protected RevisionResource parseRevisionResource(PushOneCommit.Result r) throws Exception { PatchSet.Id psId = r.getPatchSetId(); - return parseRevisionResource(psId.getParentKey().toString(), psId.get()); + return parseRevisionResource(psId.changeId().toString(), psId.get()); } protected ChangeResource parseChangeResource(String changeId) throws Exception { diff --git a/java/com/google/gerrit/common/PageLinks.java b/java/com/google/gerrit/common/PageLinks.java index 97e7ff3312..1733d5c5c9 100644 --- a/java/com/google/gerrit/common/PageLinks.java +++ b/java/com/google/gerrit/common/PageLinks.java @@ -83,7 +83,7 @@ public class PageLinks { } public static String toChange(@Nullable Project.NameKey project, PatchSet.Id ps) { - return toChange(project, ps.getParentKey()) + ps.getId(); + return toChange(project, ps.changeId()) + ps.getId(); } public static String toProject(Project.NameKey p) { diff --git a/java/com/google/gerrit/common/data/CommentDetail.java b/java/com/google/gerrit/common/data/CommentDetail.java index 1ae246f94c..2eb97cf55b 100644 --- a/java/com/google/gerrit/common/data/CommentDetail.java +++ b/java/com/google/gerrit/common/data/CommentDetail.java @@ -42,7 +42,7 @@ public class CommentDetail { protected CommentDetail() {} public void include(Change.Id changeId, Comment p) { - PatchSet.Id psId = new PatchSet.Id(changeId, p.key.patchSetId); + PatchSet.Id psId = PatchSet.id(changeId, p.key.patchSetId); if (p.side == 0) { if (idA == null && idB.equals(psId)) { a.add(p); diff --git a/java/com/google/gerrit/httpd/raw/CatServlet.java b/java/com/google/gerrit/httpd/raw/CatServlet.java index 909add2232..79f3d8bf24 100644 --- a/java/com/google/gerrit/httpd/raw/CatServlet.java +++ b/java/com/google/gerrit/httpd/raw/CatServlet.java @@ -118,7 +118,7 @@ public class CatServlet extends HttpServlet { } } - final Change.Id changeId = patchKey.getParentKey().getParentKey(); + final Change.Id changeId = patchKey.getParentKey().changeId(); String revision; try { ChangeNotes notes = changeNotesFactory.createChecked(changeId); diff --git a/java/com/google/gerrit/reviewdb/client/Change.java b/java/com/google/gerrit/reviewdb/client/Change.java index 329686c398..24c882ce30 100644 --- a/java/com/google/gerrit/reviewdb/client/Change.java +++ b/java/com/google/gerrit/reviewdb/client/Change.java @@ -618,7 +618,7 @@ public final class Change { /** Get the id of the most current {@link PatchSet} in this change. */ public PatchSet.Id currentPatchSetId() { if (currentPatchSetId > 0) { - return new PatchSet.Id(changeId, currentPatchSetId); + return PatchSet.id(changeId, currentPatchSetId); } return null; } @@ -641,7 +641,7 @@ public final class Change { } public void setCurrentPatchSet(PatchSet.Id psId, String subject, String originalSubject) { - if (!psId.getParentKey().equals(changeId)) { + if (!psId.changeId().equals(changeId)) { throw new IllegalArgumentException("patch set ID " + psId + " is not for change " + changeId); } currentPatchSetId = psId.get(); diff --git a/java/com/google/gerrit/reviewdb/client/Patch.java b/java/com/google/gerrit/reviewdb/client/Patch.java index ca1a88fc00..55dcf7646b 100644 --- a/java/com/google/gerrit/reviewdb/client/Patch.java +++ b/java/com/google/gerrit/reviewdb/client/Patch.java @@ -54,7 +54,7 @@ public final class Patch { checkKeyFormat(changeId != null, str); Integer patchSetNum = Ints.tryParse(parts.get(1)); checkKeyFormat(patchSetNum != null, str); - return key(new PatchSet.Id(new Change.Id(changeId), patchSetNum), parts.get(2)); + return key(PatchSet.id(new Change.Id(changeId), patchSetNum), parts.get(2)); } private static void checkKeyFormat(boolean test, String input) { diff --git a/java/com/google/gerrit/reviewdb/client/PatchLineComment.java b/java/com/google/gerrit/reviewdb/client/PatchLineComment.java index 6c37cbd283..6271d19bd4 100644 --- a/java/com/google/gerrit/reviewdb/client/PatchLineComment.java +++ b/java/com/google/gerrit/reviewdb/client/PatchLineComment.java @@ -57,7 +57,7 @@ public final class PatchLineComment { public static PatchLineComment from( Change.Id changeId, PatchLineComment.Status status, Comment c) { - Patch.Key patchKey = Patch.key(new PatchSet.Id(changeId, c.key.patchSetId), c.key.filename); + Patch.Key patchKey = Patch.key(PatchSet.id(changeId, c.key.patchSetId), c.key.filename); PatchLineComment plc = new PatchLineComment( patchKey, c.key.uuid, c.lineNbr, c.author.getId(), c.parentUuid, c.writtenOn); diff --git a/java/com/google/gerrit/reviewdb/client/PatchSet.java b/java/com/google/gerrit/reviewdb/client/PatchSet.java index a2c7010002..0894377161 100644 --- a/java/com/google/gerrit/reviewdb/client/PatchSet.java +++ b/java/com/google/gerrit/reviewdb/client/PatchSet.java @@ -14,8 +14,12 @@ package com.google.gerrit.reviewdb.client; +import static com.google.common.base.Preconditions.checkArgument; + +import com.google.auto.value.AutoValue; +import com.google.common.base.Splitter; +import com.google.common.primitives.Ints; import com.google.gerrit.common.Nullable; -import com.google.gwtorm.client.IntKey; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collections; @@ -74,46 +78,25 @@ public final class PatchSet { return groups; } - public static class Id extends IntKey { - private static final long serialVersionUID = 1L; - - public Change.Id changeId; - - public int patchSetId; - - public Id() { - changeId = new Change.Id(); - } - - public Id(Change.Id change, int id) { - this.changeId = change; - this.patchSetId = id; - } - - @Override - public Change.Id getParentKey() { - return changeId; - } - - @Override - public int get() { - return patchSetId; - } - - @Override - protected void set(int newValue) { - patchSetId = newValue; - } - - public String toRefName() { - return changeId.refPrefixBuilder().append(patchSetId).toString(); - } + public static Id id(Change.Id changeId, int id) { + return new AutoValue_PatchSet_Id(changeId, id); + } + @AutoValue + public abstract static class Id { /** Parse a PatchSet.Id out of a string representation. */ public static Id parse(String str) { - final Id r = new Id(); - r.fromString(str); - return r; + List parts = Splitter.on(',').splitToList(str); + checkIdFormat(parts.size() == 2, str); + Integer changeId = Ints.tryParse(parts.get(0)); + checkIdFormat(changeId != null, str); + Integer id = Ints.tryParse(parts.get(1)); + checkIdFormat(id != null, str); + return PatchSet.id(new Change.Id(changeId), id); + } + + private static void checkIdFormat(boolean test, String input) { + checkArgument(test, "invalid patch set ID: %s", input); } /** Parse a PatchSet.Id from a {@link PatchSet#getRefName()} result. */ @@ -128,7 +111,7 @@ public final class PatchSet { return null; } int changeId = Integer.parseInt(ref.substring(cs, ce)); - return new PatchSet.Id(new Change.Id(changeId), patchSetId); + return PatchSet.id(new Change.Id(changeId), patchSetId); } static int fromRef(String ref, int changeIdEnd) { @@ -145,13 +128,30 @@ public final class PatchSet { return Integer.parseInt(ref.substring(ps)); } - public String getId() { - return toId(patchSetId); - } - public static String toId(int number) { return number == 0 ? "edit" : String.valueOf(number); } + + public String getId() { + return toId(id()); + } + + public abstract Change.Id changeId(); + + abstract int id(); + + public int get() { + return id(); + } + + public String toRefName() { + return changeId().refPrefixBuilder().append(id()).toString(); + } + + @Override + public String toString() { + return changeId().toString() + ',' + id(); + } } protected Id id; diff --git a/java/com/google/gerrit/reviewdb/converter/ChangeProtoConverter.java b/java/com/google/gerrit/reviewdb/converter/ChangeProtoConverter.java index 30b6d27b43..f6e5f0ea33 100644 --- a/java/com/google/gerrit/reviewdb/converter/ChangeProtoConverter.java +++ b/java/com/google/gerrit/reviewdb/converter/ChangeProtoConverter.java @@ -100,7 +100,7 @@ public enum ChangeProtoConverter implements ProtoConverter existing = changeRefNames .map(PatchSet.Id::fromRef) - .filter(psId -> psId != null && psId.getParentKey().equals(id.getParentKey())) + .filter(psId -> psId != null && psId.changeId().equals(id.changeId())) .collect(toSet()); PatchSet.Id next = nextPatchSetId(id); while (existing.contains(next)) { @@ -103,7 +103,7 @@ public class ChangeUtil { * @return next patch set ID for the same change, incrementing by 1. */ public static PatchSet.Id nextPatchSetId(PatchSet.Id id) { - return new PatchSet.Id(id.getParentKey(), id.get() + 1); + return PatchSet.id(id.changeId(), id.get() + 1); } /** @@ -116,7 +116,7 @@ public class ChangeUtil { */ public static PatchSet.Id nextPatchSetId(Repository git, PatchSet.Id id) throws IOException { return nextPatchSetIdFromChangeRefs( - git.getRefDatabase().getRefsByPrefix(id.getParentKey().toRefPrefix()).stream() + git.getRefDatabase().getRefsByPrefix(id.changeId().toRefPrefix()).stream() .map(Ref::getName), id); } diff --git a/java/com/google/gerrit/server/CommentsUtil.java b/java/com/google/gerrit/server/CommentsUtil.java index a5332eb284..844a5ff5b9 100644 --- a/java/com/google/gerrit/server/CommentsUtil.java +++ b/java/com/google/gerrit/server/CommentsUtil.java @@ -92,7 +92,7 @@ public class CommentsUtil { }; public static PatchSet.Id getCommentPsId(Change.Id changeId, Comment comment) { - return new PatchSet.Id(changeId, comment.key.patchSetId); + return PatchSet.id(changeId, comment.key.patchSetId); } public static String extractMessageId(@Nullable String tag) { @@ -131,7 +131,7 @@ public class CommentsUtil { unresolved = false; } else { // Inherit unresolved value from inReplyTo comment if not specified. - Comment.Key key = new Comment.Key(parentUuid, path, psId.patchSetId); + Comment.Key key = new Comment.Key(parentUuid, path, psId.get()); Optional parent = getPublished(ctx.getNotes(), key); if (!parent.isPresent()) { throw new UnprocessableEntityException("Invalid parentUuid supplied for comment"); diff --git a/java/com/google/gerrit/server/PatchSetUtil.java b/java/com/google/gerrit/server/PatchSetUtil.java index 2a78eb6c77..0dc20b7955 100644 --- a/java/com/google/gerrit/server/PatchSetUtil.java +++ b/java/com/google/gerrit/server/PatchSetUtil.java @@ -112,7 +112,7 @@ public class PatchSetUtil { private static void ensurePatchSetMatches(PatchSet.Id psId, ChangeUpdate update) { Change.Id changeId = update.getChange().getId(); checkArgument( - psId.getParentKey().equals(changeId), + psId.changeId().equals(changeId), "cannot modify patch set %s on update for change %s", psId, changeId); diff --git a/java/com/google/gerrit/server/PublishCommentUtil.java b/java/com/google/gerrit/server/PublishCommentUtil.java index ad93ef008d..f8697419ef 100644 --- a/java/com/google/gerrit/server/PublishCommentUtil.java +++ b/java/com/google/gerrit/server/PublishCommentUtil.java @@ -75,6 +75,6 @@ public class PublishCommentUtil { } private static PatchSet.Id psId(ChangeNotes notes, Comment c) { - return new PatchSet.Id(notes.getChangeId(), c.key.patchSetId); + return PatchSet.id(notes.getChangeId(), c.key.patchSetId); } } diff --git a/java/com/google/gerrit/server/ReviewerSet.java b/java/com/google/gerrit/server/ReviewerSet.java index a3be19ed94..f9f9a9d8d6 100644 --- a/java/com/google/gerrit/server/ReviewerSet.java +++ b/java/com/google/gerrit/server/ReviewerSet.java @@ -44,11 +44,7 @@ public class ReviewerSet { first = psa; } else { checkArgument( - first - .getKey() - .patchSetId() - .getParentKey() - .equals(psa.getKey().patchSetId().getParentKey()), + first.getKey().patchSetId().changeId().equals(psa.getKey().patchSetId().changeId()), "multiple change IDs: %s, %s", first.getKey(), psa.getKey()); diff --git a/java/com/google/gerrit/server/change/ChangeInserter.java b/java/com/google/gerrit/server/change/ChangeInserter.java index 6bb182dfa6..1266cbd622 100644 --- a/java/com/google/gerrit/server/change/ChangeInserter.java +++ b/java/com/google/gerrit/server/change/ChangeInserter.java @@ -168,7 +168,7 @@ public class ChangeInserter implements InsertChangeOp { this.reviewerAdder = reviewerAdder; this.changeId = changeId; - this.psId = new PatchSet.Id(changeId, INITIAL_PATCH_SET_ID); + this.psId = PatchSet.id(changeId, INITIAL_PATCH_SET_ID); this.commitId = commitId.copy(); this.refName = refName; this.reviewerInputs = ImmutableList.of(); diff --git a/java/com/google/gerrit/server/change/ConsistencyChecker.java b/java/com/google/gerrit/server/change/ConsistencyChecker.java index 938ea15e63..c90e2d53cd 100644 --- a/java/com/google/gerrit/server/change/ConsistencyChecker.java +++ b/java/com/google/gerrit/server/change/ConsistencyChecker.java @@ -420,8 +420,7 @@ public class ConsistencyChecker { continue; } try { - Change c = - notesFactory.createChecked(change().getProject(), psId.getParentKey()).getChange(); + Change c = notesFactory.createChecked(change().getProject(), psId.changeId()).getChange(); if (!c.getDest().equals(change().getDest())) { continue; } @@ -640,7 +639,7 @@ public class ConsistencyChecker { try (BatchUpdate bu = newBatchUpdate()) { bu.setRepository(repo, rw, oi); for (DeletePatchSetFromDbOp op : ops) { - checkArgument(op.psId.getParentKey().equals(notes.getChangeId())); + checkArgument(op.psId.changeId().equals(notes.getChangeId())); bu.addOp(notes.getChangeId(), op); } bu.addOp(notes.getChangeId(), new UpdateCurrentPatchSetOp(ops)); @@ -652,7 +651,7 @@ public class ConsistencyChecker { } } catch (UpdateException | RestApiException e) { String msg = "Error deleting patch set"; - logger.atWarning().withCause(e).log("%s of change %s", msg, ops.get(0).psId.getParentKey()); + logger.atWarning().withCause(e).log("%s of change %s", msg, ops.get(0).psId.changeId()); for (DeletePatchSetFromDbOp op : ops) { // Overwrite existing statuses that were set before the transaction was // rolled back. diff --git a/java/com/google/gerrit/server/change/DeleteChangeOp.java b/java/com/google/gerrit/server/change/DeleteChangeOp.java index ad687dec0f..0eec8d5721 100644 --- a/java/com/google/gerrit/server/change/DeleteChangeOp.java +++ b/java/com/google/gerrit/server/change/DeleteChangeOp.java @@ -114,7 +114,7 @@ public class DeleteChangeOp implements BatchUpdateOp { @Override public void updateRepo(RepoContext ctx) throws IOException { - String prefix = new PatchSet.Id(id, 1).toRefName(); + String prefix = PatchSet.id(id, 1).toRefName(); prefix = prefix.substring(0, prefix.length() - 1); for (Map.Entry e : ctx.getRepoView().getRefs(prefix).entrySet()) { ctx.addRefUpdate(e.getValue(), ObjectId.zeroId(), prefix + e.getKey()); diff --git a/java/com/google/gerrit/server/change/LabelNormalizer.java b/java/com/google/gerrit/server/change/LabelNormalizer.java index 831095bb02..63c9165719 100644 --- a/java/com/google/gerrit/server/change/LabelNormalizer.java +++ b/java/com/google/gerrit/server/change/LabelNormalizer.java @@ -88,7 +88,7 @@ public class LabelNormalizer { List deleted = Lists.newArrayListWithCapacity(approvals.size()); LabelTypes labelTypes = projectCache.checkedGet(notes.getProjectName()).getLabelTypes(notes); for (PatchSetApproval psa : approvals) { - Change.Id changeId = psa.getKey().patchSetId().getParentKey(); + Change.Id changeId = psa.getKey().patchSetId().changeId(); checkArgument( changeId.equals(notes.getChangeId()), "Approval %s does not match change %s", diff --git a/java/com/google/gerrit/server/change/RebaseChangeOp.java b/java/com/google/gerrit/server/change/RebaseChangeOp.java index fccda7c138..ea79dd8041 100644 --- a/java/com/google/gerrit/server/change/RebaseChangeOp.java +++ b/java/com/google/gerrit/server/change/RebaseChangeOp.java @@ -178,9 +178,7 @@ public class RebaseChangeOp implements BatchUpdateOp { rebasedPatchSetId = ChangeUtil.nextPatchSetIdFromChangeRefs( - ctx.getRepoView() - .getRefs(originalPatchSet.getId().getParentKey().toRefPrefix()) - .keySet(), + ctx.getRepoView().getRefs(originalPatchSet.getId().changeId().toRefPrefix()).keySet(), notes.getChange().currentPatchSetId()); patchSetInserter = patchSetInserterFactory diff --git a/java/com/google/gerrit/server/change/RebaseUtil.java b/java/com/google/gerrit/server/change/RebaseUtil.java index bd65d34638..01a7946dfa 100644 --- a/java/com/google/gerrit/server/change/RebaseUtil.java +++ b/java/com/google/gerrit/server/change/RebaseUtil.java @@ -87,11 +87,11 @@ public class RebaseUtil { // Try parsing the base as a ref string. PatchSet.Id basePatchSetId = PatchSet.Id.fromRef(base); if (basePatchSetId != null) { - Change.Id baseChangeId = basePatchSetId.getParentKey(); + Change.Id baseChangeId = basePatchSetId.changeId(); ChangeNotes baseNotes = notesFor(rsrc, baseChangeId); if (baseNotes != null) { return Base.create( - notesFor(rsrc, basePatchSetId.getParentKey()), psUtil.get(baseNotes, basePatchSetId)); + notesFor(rsrc, basePatchSetId.changeId()), psUtil.get(baseNotes, basePatchSetId)); } } diff --git a/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/java/com/google/gerrit/server/edit/ChangeEditUtil.java index cb8147c7e2..cac77d9631 100644 --- a/java/com/google/gerrit/server/edit/ChangeEditUtil.java +++ b/java/com/google/gerrit/server/edit/ChangeEditUtil.java @@ -122,7 +122,7 @@ public class ChangeEditUtil { String[] refNames = new String[n]; for (int i = n; i > 0; i--) { refNames[i - 1] = - RefNames.refsEdit(u.getAccountId(), change.getId(), new PatchSet.Id(change.getId(), i)); + RefNames.refsEdit(u.getAccountId(), change.getId(), PatchSet.id(change.getId(), i)); } Ref ref = repo.getRefDatabase().firstExactRef(refNames); if (ref == null) { @@ -223,7 +223,7 @@ public class ChangeEditUtil { int pos = ref.getName().lastIndexOf('/'); checkArgument(pos > 0, "invalid edit ref: %s", ref.getName()); String psId = ref.getName().substring(pos + 1); - return psUtil.get(notes, new PatchSet.Id(notes.getChange().getId(), Integer.parseInt(psId))); + return psUtil.get(notes, PatchSet.id(notes.getChange().getId(), Integer.parseInt(psId))); } catch (StorageException | NumberFormatException e) { throw new IOException(e); } diff --git a/java/com/google/gerrit/server/events/EventBroker.java b/java/com/google/gerrit/server/events/EventBroker.java index 8eb3849d5a..a58102f320 100644 --- a/java/com/google/gerrit/server/events/EventBroker.java +++ b/java/com/google/gerrit/server/events/EventBroker.java @@ -21,6 +21,7 @@ import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSet; +import com.google.gerrit.reviewdb.client.PatchSet.Id; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.notedb.ChangeNotes; @@ -194,7 +195,7 @@ public class EventBroker implements EventDispatcher { RefEvent refEvent = (RefEvent) event; String ref = refEvent.getRefName(); if (PatchSet.isChangeRef(ref)) { - Change.Id cid = PatchSet.Id.fromRef(ref).getParentKey(); + Change.Id cid = Id.fromRef(ref).changeId(); try { Change change = notesFactory.createChecked(refEvent.getProjectNameKey(), cid).getChange(); return isVisibleTo(change, user); diff --git a/java/com/google/gerrit/server/extensions/events/EventUtil.java b/java/com/google/gerrit/server/extensions/events/EventUtil.java index d00eb31721..2e09c7bba2 100644 --- a/java/com/google/gerrit/server/extensions/events/EventUtil.java +++ b/java/com/google/gerrit/server/extensions/events/EventUtil.java @@ -84,7 +84,7 @@ public class EventUtil { public RevisionInfo revisionInfo(Project.NameKey project, PatchSet ps) throws PatchListNotAvailableException, GpgException, IOException, PermissionBackendException { - ChangeData cd = changeDataFactory.create(project, ps.getId().getParentKey()); + ChangeData cd = changeDataFactory.create(project, ps.getId().changeId()); return revisionJsonFactory.create(CHANGE_OPTIONS).getRevisionInfo(cd, ps); } diff --git a/java/com/google/gerrit/server/git/CodeReviewCommit.java b/java/com/google/gerrit/server/git/CodeReviewCommit.java index c210dcdaaa..4c6be2005d 100644 --- a/java/com/google/gerrit/server/git/CodeReviewCommit.java +++ b/java/com/google/gerrit/server/git/CodeReviewCommit.java @@ -48,7 +48,7 @@ public class CodeReviewCommit extends RevCommit { Ordering.natural() .onResultOf( (CodeReviewCommit c) -> - c.getPatchsetId() != null ? c.getPatchsetId().getParentKey().get() : null) + c.getPatchsetId() != null ? c.getPatchsetId().changeId().get() : null) .nullsFirst(); public static CodeReviewRevWalk newRevWalk(Repository repo) { diff --git a/java/com/google/gerrit/server/git/GroupCollector.java b/java/com/google/gerrit/server/git/GroupCollector.java index 07c995fee8..3f45fba7e1 100644 --- a/java/com/google/gerrit/server/git/GroupCollector.java +++ b/java/com/google/gerrit/server/git/GroupCollector.java @@ -107,7 +107,7 @@ public class GroupCollector { transformRefs(changeRefsById), psId -> { // TODO(dborowitz): Reuse open repository from caller. - ChangeNotes notes = notesFactory.createChecked(project, psId.getParentKey()); + ChangeNotes notes = notesFactory.createChecked(project, psId.changeId()); PatchSet ps = psUtil.get(notes, psId); return ps != null ? ps.getGroups() : null; }); diff --git a/java/com/google/gerrit/server/git/MergeUtil.java b/java/com/google/gerrit/server/git/MergeUtil.java index 41048f65d4..68b6c538eb 100644 --- a/java/com/google/gerrit/server/git/MergeUtil.java +++ b/java/com/google/gerrit/server/git/MergeUtil.java @@ -974,7 +974,7 @@ public class MergeUtil { if (c.getPatchsetId() == null) { continue; } - Change.Id id = c.getPatchsetId().getParentKey(); + Change.Id id = c.getPatchsetId().changeId(); if (!expected.contains(id)) { continue; } diff --git a/java/com/google/gerrit/server/git/MergedByPushOp.java b/java/com/google/gerrit/server/git/MergedByPushOp.java index 37814260c3..cfe05eeb75 100644 --- a/java/com/google/gerrit/server/git/MergedByPushOp.java +++ b/java/com/google/gerrit/server/git/MergedByPushOp.java @@ -172,7 +172,7 @@ public class MergedByPushOp implements BatchUpdateOp { public void run() { try { MergedSender cm = - mergedSenderFactory.create(ctx.getProject(), psId.getParentKey()); + mergedSenderFactory.create(ctx.getProject(), psId.changeId()); cm.setFrom(ctx.getAccountId()); cm.setPatchSet(patchSet, info); cm.send(); diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index 8541eef246..8a5b5a2756 100644 --- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java @@ -2903,7 +2903,7 @@ class ReceiveCommits { private void addOps(BatchUpdate bu) { bu.addOp( - psId.getParentKey(), + psId.changeId(), new BatchUpdateOp() { @Override public boolean updateChange(ChangeContext ctx) { @@ -2998,7 +2998,7 @@ class ReceiveCommits { PatchSet.Id psId = PatchSet.Id.fromRef(ref.getName()); if (psId != null) { refsById.put(obj, ref); - refsByChange.put(psId.getParentKey(), ref); + refsByChange.put(psId.changeId(), ref); } } } @@ -3164,12 +3164,12 @@ class ReceiveCommits { for (Ref ref : byCommit.get(c.copy())) { PatchSet.Id psId = PatchSet.Id.fromRef(ref.getName()); - Optional notes = getChangeNotes(psId.getParentKey()); + Optional notes = getChangeNotes(psId.changeId()); if (notes.isPresent() && notes.get().getChange().getDest().equals(branch)) { existingPatchSets++; bu.addOp(notes.get().getChangeId(), setPrivateOpFactory.create(false, null)); bu.addOp( - psId.getParentKey(), + psId.changeId(), mergedByPushOpFactory.create(requestScopePropagator, psId, refName)); continue COMMIT; } diff --git a/java/com/google/gerrit/server/git/validators/MergeValidators.java b/java/com/google/gerrit/server/git/validators/MergeValidators.java index a8701cb2f0..8cd4751ca0 100644 --- a/java/com/google/gerrit/server/git/validators/MergeValidators.java +++ b/java/com/google/gerrit/server/git/validators/MergeValidators.java @@ -295,8 +295,7 @@ public class MergeValidators { } ChangeData cd = - changeDataFactory.create( - destProject.getProject().getNameKey(), patchSetId.getParentKey()); + changeDataFactory.create(destProject.getProject().getNameKey(), patchSetId.changeId()); try { if (!cd.currentFilePaths().contains(AccountProperties.ACCOUNT_CONFIG)) { return; diff --git a/java/com/google/gerrit/server/mail/receive/MailProcessor.java b/java/com/google/gerrit/server/mail/receive/MailProcessor.java index b1acab9961..1f8471b523 100644 --- a/java/com/google/gerrit/server/mail/receive/MailProcessor.java +++ b/java/com/google/gerrit/server/mail/receive/MailProcessor.java @@ -259,7 +259,7 @@ public class MailProcessor { return; } - Op o = new Op(new PatchSet.Id(cd.getId(), metadata.patchSet), parsedComments, message.id()); + Op o = new Op(PatchSet.id(cd.getId(), metadata.patchSet), parsedComments, message.id()); BatchUpdate batchUpdate = buf.create(project, ctx.getUser(), TimeUtil.nowTs()); batchUpdate.addOp(cd.getId(), o); batchUpdate.execute(); @@ -362,7 +362,7 @@ public class MailProcessor { if (mailComment.getInReplyTo() != null) { return psUtil.get( ctx.getNotes(), - new PatchSet.Id(ctx.getChange().getId(), mailComment.getInReplyTo().key.patchSetId)); + PatchSet.id(ctx.getChange().getId(), mailComment.getInReplyTo().key.patchSetId)); } return current; } diff --git a/java/com/google/gerrit/server/mail/send/ChangeEmail.java b/java/com/google/gerrit/server/mail/send/ChangeEmail.java index 7aa0aae149..a3493d0bbf 100644 --- a/java/com/google/gerrit/server/mail/send/ChangeEmail.java +++ b/java/com/google/gerrit/server/mail/send/ChangeEmail.java @@ -293,7 +293,7 @@ public abstract class ChangeEmail extends NotificationEmail { ps = patchSet; } else { try { - ps = args.patchSetUtil.get(changeData.notes(), new PatchSet.Id(change.getId(), patchSetId)); + ps = args.patchSetUtil.get(changeData.notes(), PatchSet.id(change.getId(), patchSetId)); } catch (StorageException e) { throw new PatchListNotAvailableException("Failed to get patchSet"); } diff --git a/java/com/google/gerrit/server/notedb/AbstractChangeUpdate.java b/java/com/google/gerrit/server/notedb/AbstractChangeUpdate.java index b9ce8630b5..eba9f3cfcc 100644 --- a/java/com/google/gerrit/server/notedb/AbstractChangeUpdate.java +++ b/java/com/google/gerrit/server/notedb/AbstractChangeUpdate.java @@ -147,7 +147,7 @@ public abstract class AbstractChangeUpdate { } public void setPatchSetId(PatchSet.Id psId) { - checkArgument(psId == null || psId.getParentKey().equals(getId())); + checkArgument(psId == null || psId.changeId().equals(getId())); this.psId = psId; } diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesParser.java b/java/com/google/gerrit/server/notedb/ChangeNotesParser.java index 6cbb21a4fb..a2aecf3c42 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesParser.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesParser.java @@ -633,7 +633,7 @@ class ChangeNotesParser { if (psId == null) { throw invalidFooter(FOOTER_PATCH_SET, psIdStr); } - return new PatchSet.Id(id, psId); + return PatchSet.id(id, psId); } private PatchSetState parsePatchSetState(ChangeNotesCommit commit) throws ConfigInvalidException { @@ -689,8 +689,7 @@ class ChangeNotesParser { } ChangeMessage changeMessage = - new ChangeMessage( - ChangeMessage.key(psId.getParentKey(), commit.name()), accountId, ts, psId); + new ChangeMessage(ChangeMessage.key(psId.changeId(), commit.name()), accountId, ts, psId); changeMessage.setMessage(changeMsgString.get()); changeMessage.setTag(tag); changeMessage.setRealAuthor(realAccountId); @@ -1031,7 +1030,7 @@ class ChangeNotesParser { pruneEntitiesForMissingPatchSets(allChangeMessages, ChangeMessage::getPatchSetId, missing); pruned += pruneEntitiesForMissingPatchSets( - comments.values(), c -> new PatchSet.Id(id, c.key.patchSetId), missing); + comments.values(), c -> PatchSet.id(id, c.key.patchSetId), missing); pruned += pruneEntitiesForMissingPatchSets( approvals.values(), PatchSetApproval::getPatchSetId, missing); diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesState.java b/java/com/google/gerrit/server/notedb/ChangeNotesState.java index b96d807e69..1c94539e7b 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesState.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesState.java @@ -601,7 +601,7 @@ public abstract class ChangeNotesState { .owner(Account.id(proto.getOwner())) .branch(proto.getBranch()); if (proto.getHasCurrentPatchSetId()) { - b.currentPatchSetId(new PatchSet.Id(changeId, proto.getCurrentPatchSetId())); + b.currentPatchSetId(PatchSet.id(changeId, proto.getCurrentPatchSetId())); } b.subject(proto.getSubject()); if (proto.getHasTopic()) { diff --git a/java/com/google/gerrit/server/notedb/LegacyChangeNoteRead.java b/java/com/google/gerrit/server/notedb/LegacyChangeNoteRead.java index 916cc16d79..7e53630ec0 100644 --- a/java/com/google/gerrit/server/notedb/LegacyChangeNoteRead.java +++ b/java/com/google/gerrit/server/notedb/LegacyChangeNoteRead.java @@ -124,7 +124,7 @@ public class LegacyChangeNoteRead { boolean isForBase, Integer parentNumber) throws ConfigInvalidException { - Change.Id changeId = psId.getParentKey(); + Change.Id changeId = psId.changeId(); // Check if there is a new file. boolean newFile = @@ -285,7 +285,7 @@ public class LegacyChangeNoteRead { } checkResult(patchSetId, "patchset id", changeId); curr.value = endOfLine; - return new PatchSet.Id(changeId, patchSetId); + return PatchSet.id(changeId, patchSetId); } private static Integer parseParentNumber(byte[] note, MutableInteger curr, Change.Id changeId) diff --git a/java/com/google/gerrit/server/patch/PatchScriptFactory.java b/java/com/google/gerrit/server/patch/PatchScriptFactory.java index 0ded3ebd0f..d574ea41f7 100644 --- a/java/com/google/gerrit/server/patch/PatchScriptFactory.java +++ b/java/com/google/gerrit/server/patch/PatchScriptFactory.java @@ -136,7 +136,7 @@ public class PatchScriptFactory implements Callable { this.psb = patchSetB; this.diffPrefs = diffPrefs; - changeId = patchSetB.getParentKey(); + changeId = patchSetB.changeId(); } @AssistedInject @@ -172,7 +172,7 @@ public class PatchScriptFactory implements Callable { this.psb = patchSetB; this.diffPrefs = diffPrefs; - changeId = patchSetB.getParentKey(); + changeId = patchSetB.changeId(); checkArgument(parentNum >= 0, "parentNum must be >= 0"); } @@ -284,7 +284,7 @@ public class PatchScriptFactory implements Callable { private void validatePatchSetId(PatchSet.Id psId) throws NoSuchChangeException { if (psId == null) { // OK, means use base; - } else if (changeId.equals(psId.getParentKey())) { // OK, same change; + } else if (changeId.equals(psId.changeId())) { // OK, same change; } else { throw new NoSuchChangeException(changeId); } @@ -324,7 +324,7 @@ public class PatchScriptFactory implements Callable { byKey.put(p.getKey(), p); } if (edit != null && edit.isPresent()) { - Patch p = new Patch(Patch.key(new PatchSet.Id(psb.getParentKey(), 0), fileName)); + Patch p = new Patch(Patch.key(PatchSet.id(psb.changeId(), 0), fileName)); history.add(p); byKey.put(p.getKey(), p); } @@ -385,7 +385,7 @@ public class PatchScriptFactory implements Callable { private void loadPublished(Map byKey, String file) { for (Comment c : commentsUtil.publishedByChangeFile(notes, file)) { comments.include(notes.getChangeId(), c); - PatchSet.Id psId = new PatchSet.Id(notes.getChangeId(), c.key.patchSetId); + PatchSet.Id psId = PatchSet.id(notes.getChangeId(), c.key.patchSetId); Patch.Key pKey = Patch.key(psId, c.key.filename); Patch p = byKey.get(pKey); if (p != null) { @@ -397,7 +397,7 @@ public class PatchScriptFactory implements Callable { private void loadDrafts(Map byKey, Account.Id me, String file) { for (Comment c : commentsUtil.draftByChangeFileAuthor(notes, file, me)) { comments.include(notes.getChangeId(), c); - PatchSet.Id psId = new PatchSet.Id(notes.getChangeId(), c.key.patchSetId); + PatchSet.Id psId = PatchSet.id(notes.getChangeId(), c.key.patchSetId); Patch.Key pKey = Patch.key(psId, c.key.filename); Patch p = byKey.get(pKey); if (p != null) { diff --git a/java/com/google/gerrit/server/query/change/ChangeData.java b/java/com/google/gerrit/server/query/change/ChangeData.java index 5a7a8a67cb..63faf9f10c 100644 --- a/java/com/google/gerrit/server/query/change/ChangeData.java +++ b/java/com/google/gerrit/server/query/change/ChangeData.java @@ -227,7 +227,7 @@ public class ChangeData { new ChangeData( null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, project, id, null, null); - cd.currentPatchSet = new PatchSet(new PatchSet.Id(id, currentPatchSetId)); + cd.currentPatchSet = new PatchSet(PatchSet.id(id, currentPatchSetId)); return cd; } diff --git a/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java b/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java index 478830143e..82a440da82 100644 --- a/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java +++ b/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java @@ -180,7 +180,7 @@ public class DeleteDraftComments boolean dirty = false; for (Comment c : commentsUtil.draftByChangeAuthor(ctx.getNotes(), accountId)) { dirty = true; - PatchSet.Id psId = new PatchSet.Id(ctx.getChange().getId(), c.key.patchSetId); + PatchSet.Id psId = PatchSet.id(ctx.getChange().getId(), c.key.patchSetId); setCommentRevId(c, patchListCache, ctx.getChange(), psUtil.get(ctx.getNotes(), psId)); commentsUtil.deleteComments(ctx.getUpdate(psId), Collections.singleton(c)); comments.add(commentFormatter.format(c)); diff --git a/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java b/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java index de04d36184..1a114ef760 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java @@ -88,7 +88,7 @@ public class DeleteDraftComment if (!maybeComment.isPresent()) { return false; // Nothing to do. } - PatchSet.Id psId = new PatchSet.Id(ctx.getChange().getId(), key.patchSetId); + PatchSet.Id psId = PatchSet.id(ctx.getChange().getId(), key.patchSetId); PatchSet ps = psUtil.get(ctx.getNotes(), psId); if (ps == null) { throw new ResourceNotFoundException("patch set not found: " + psId); diff --git a/java/com/google/gerrit/server/restapi/change/GetDiff.java b/java/com/google/gerrit/server/restapi/change/GetDiff.java index c0d4cf2703..d832598c12 100644 --- a/java/com/google/gerrit/server/restapi/change/GetDiff.java +++ b/java/com/google/gerrit/server/restapi/change/GetDiff.java @@ -204,7 +204,7 @@ public class GetDiff implements RestReadView { List links = webLinks.getDiffLinks( state.getName(), - resource.getPatchKey().getParentKey().getParentKey().get(), + resource.getPatchKey().getParentKey().changeId().get(), basePatchSet != null ? basePatchSet.getId().get() : null, revA, MoreObjects.firstNonNull(ps.getOldName(), ps.getNewName()), diff --git a/java/com/google/gerrit/server/restapi/change/GetRelated.java b/java/com/google/gerrit/server/restapi/change/GetRelated.java index 332cc4de08..ef383f68fb 100644 --- a/java/com/google/gerrit/server/restapi/change/GetRelated.java +++ b/java/com/google/gerrit/server/restapi/change/GetRelated.java @@ -128,7 +128,7 @@ public class GetRelated implements RestReadView { private void reloadChangeIfStale(List cds, PatchSet wantedPs) { for (ChangeData cd : cds) { - if (cd.getId().equals(wantedPs.getId().getParentKey())) { + if (cd.getId().equals(wantedPs.getId().changeId())) { if (cd.patchSet(wantedPs.getId()) == null) { cd.reloadChange(); } diff --git a/java/com/google/gerrit/server/restapi/change/PutDraftComment.java b/java/com/google/gerrit/server/restapi/change/PutDraftComment.java index f6c9abe65d..1515efa714 100644 --- a/java/com/google/gerrit/server/restapi/change/PutDraftComment.java +++ b/java/com/google/gerrit/server/restapi/change/PutDraftComment.java @@ -124,7 +124,7 @@ public class PutDraftComment // user. ctx.getUser().updateRealAccountId(comment::setRealAuthor); - PatchSet.Id psId = new PatchSet.Id(ctx.getChange().getId(), origComment.key.patchSetId); + PatchSet.Id psId = PatchSet.id(ctx.getChange().getId(), origComment.key.patchSetId); ChangeUpdate update = ctx.getUpdate(psId); PatchSet ps = psUtil.get(ctx.getNotes(), psId); diff --git a/java/com/google/gerrit/server/restapi/change/Rebase.java b/java/com/google/gerrit/server/restapi/change/Rebase.java index e917d8ef62..b5fe1d0502 100644 --- a/java/com/google/gerrit/server/restapi/change/Rebase.java +++ b/java/com/google/gerrit/server/restapi/change/Rebase.java @@ -160,7 +160,7 @@ public class Rebase extends RetryingRestModifyView byLegacyPatchSetId(ChangeResource change, String id) { - PatchSet ps = - psUtil.get(change.getNotes(), new PatchSet.Id(change.getId(), Integer.parseInt(id))); + PatchSet ps = psUtil.get(change.getNotes(), PatchSet.id(change.getId(), Integer.parseInt(id))); if (ps != null) { return Collections.singletonList(new RevisionResource(change, ps)); } @@ -153,7 +152,7 @@ public class Revisions implements ChildCollection edit = editUtil.byChange(change.getNotes(), change.getUser()); if (edit.isPresent()) { - PatchSet ps = new PatchSet(new PatchSet.Id(change.getId(), 0)); + PatchSet ps = new PatchSet(PatchSet.id(change.getId(), 0)); RevId editRevId = new RevId(ObjectId.toString(edit.get().getEditCommit())); ps.setRevision(editRevId); if (revid == null || editRevId.equals(revid)) { diff --git a/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java b/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java index ee3d0a8189..a81830baf5 100644 --- a/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java +++ b/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java @@ -137,8 +137,7 @@ public class CreateAccessChange implements RestModifyView builder = ImmutableSet.builder(); do { builder.add(rs.getString("file_name")); diff --git a/java/com/google/gerrit/server/submit/SubmitStrategyListener.java b/java/com/google/gerrit/server/submit/SubmitStrategyListener.java index 782cd7bde6..3d6aa552c7 100644 --- a/java/com/google/gerrit/server/submit/SubmitStrategyListener.java +++ b/java/com/google/gerrit/server/submit/SubmitStrategyListener.java @@ -129,7 +129,7 @@ public class SubmitStrategyListener implements BatchUpdateListener { case ALREADY_MERGED: // Already an ancestor of tip. - alreadyMerged.add(commit.getPatchsetId().getParentKey()); + alreadyMerged.add(commit.getPatchsetId().changeId()); break; case PATH_CONFLICT: diff --git a/java/com/google/gerrit/sshd/commands/PatchSetParser.java b/java/com/google/gerrit/sshd/commands/PatchSetParser.java index 4618847822..7cee37f1f2 100644 --- a/java/com/google/gerrit/sshd/commands/PatchSetParser.java +++ b/java/com/google/gerrit/sshd/commands/PatchSetParser.java @@ -101,7 +101,7 @@ public class PatchSetParser { } catch (IllegalArgumentException e) { throw error("\"" + token + "\" is not a valid patch set"); } - ChangeNotes notes = getNotes(projectState, patchSetId.getParentKey()); + ChangeNotes notes = getNotes(projectState, patchSetId.changeId()); PatchSet patchSet = psUtil.get(notes, patchSetId); if (patchSet == null) { throw error("\"" + token + "\" no such patch set"); diff --git a/java/com/google/gerrit/sshd/commands/ReviewCommand.java b/java/com/google/gerrit/sshd/commands/ReviewCommand.java index 7af07de779..754542c52d 100644 --- a/java/com/google/gerrit/sshd/commands/ReviewCommand.java +++ b/java/com/google/gerrit/sshd/commands/ReviewCommand.java @@ -227,7 +227,7 @@ public class ReviewCommand extends SshCommand { writeError("error", e.getMessage() + "\n"); } catch (NoSuchChangeException e) { ok = false; - writeError("error", "no such change " + patchSet.getId().getParentKey().get()); + writeError("error", "no such change " + patchSet.getId().changeId().get()); } catch (Exception e) { ok = false; writeError("fatal", "internal server error while reviewing " + patchSet.getId() + "\n"); @@ -242,7 +242,7 @@ public class ReviewCommand extends SshCommand { private void applyReview(PatchSet patchSet, ReviewInput review) throws RestApiException { gApi.changes() - .id(patchSet.getId().getParentKey().get()) + .id(patchSet.getId().changeId().get()) .revision(patchSet.getRevision().get()) .review(review); } @@ -310,7 +310,7 @@ public class ReviewCommand extends SshCommand { } private ChangeApi changeApi(PatchSet patchSet) throws RestApiException { - return gApi.changes().id(patchSet.getId().getParentKey().get()); + return gApi.changes().id(patchSet.getId().changeId().get()); } private RevisionApi revisionApi(PatchSet patchSet) throws RestApiException { diff --git a/java/com/google/gerrit/testing/TestChanges.java b/java/com/google/gerrit/testing/TestChanges.java index f2c9b6d213..1bf73b4957 100644 --- a/java/com/google/gerrit/testing/TestChanges.java +++ b/java/com/google/gerrit/testing/TestChanges.java @@ -129,7 +129,7 @@ public class TestChanges { public static void incrementPatchSet(Change change) { PatchSet.Id curr = change.currentPatchSetId(); PatchSetInfo ps = - new PatchSetInfo(new PatchSet.Id(change.getId(), curr != null ? curr.get() + 1 : 1)); + new PatchSetInfo(PatchSet.id(change.getId(), curr != null ? curr.get() + 1 : 1)); ps.setSubject("Change subject"); change.setCurrentPatchSet(ps); } diff --git a/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java b/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java index 0ef3473e97..6073bebd57 100644 --- a/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java +++ b/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java @@ -276,7 +276,7 @@ public class PushPermissionsIT extends AbstractDaemonTest { Change.Id id = new Change.Id(gApi.changes().create(ci).get()._number); requestScopeOperations.setApiUser(admin.id()); - ObjectId ps1Id = forceFetch(new PatchSet.Id(id, 1).toRefName()); + ObjectId ps1Id = forceFetch(PatchSet.id(id, 1).toRefName()); ObjectId ps2Id = testRepo.amend(ps1Id).add("file", "content").create(); PushResult r = push(ps2Id.name() + ":refs/for/master"); assertThat(r) diff --git a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java index 45c86ec652..4da1d113fb 100644 --- a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java +++ b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java @@ -442,7 +442,7 @@ public class RefAdvertisementIT extends AbstractDaemonTest { TestRepository tr = new TestRepository<>(repo); String subject = "Subject for missing commit"; Change c = new Change(cd3.change()); - PatchSet.Id psId = new PatchSet.Id(cd3.getId(), 2); + PatchSet.Id psId = PatchSet.id(cd3.getId(), 2); c.setCurrentPatchSet(psId, subject, c.getOriginalSubject()); PersonIdent committer = serverIdent.get(); @@ -773,7 +773,7 @@ public class RefAdvertisementIT extends AbstractDaemonTest { } private static ObjectId obj(ChangeData cd, int psNum) throws Exception { - PatchSet.Id psId = new PatchSet.Id(cd.getId(), psNum); + PatchSet.Id psId = PatchSet.id(cd.getId(), psNum); PatchSet ps = cd.patchSet(psId); assertWithMessage("%s not found in %s", psId, cd.patchSets()).that(ps).isNotNull(); return ObjectId.fromString(ps.getRevision().get()); diff --git a/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java b/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java index c488ed0f38..37f8ee5957 100644 --- a/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java +++ b/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java @@ -254,13 +254,13 @@ public class SubmitOnPushIT extends AbstractDaemonTest { r = amendChange(changeId); ChangeData cd = r.getChange(); PatchSet.Id psId2 = cd.change().currentPatchSetId(); - assertThat(psId2.getParentKey()).isEqualTo(psId1.getParentKey()); + assertThat(psId2.changeId()).isEqualTo(psId1.changeId()); assertThat(psId2.get()).isEqualTo(2); testRepo.reset(c1); assertPushOk(pushHead(testRepo, "refs/heads/master", false), "refs/heads/master"); - cd = changeDataFactory.create(project, psId1.getParentKey()); + cd = changeDataFactory.create(project, psId1.changeId()); Change c = cd.change(); assertThat(c.isMerged()).isTrue(); assertThat(c.currentPatchSetId()).isEqualTo(psId1); @@ -316,7 +316,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest { } private PatchSetApproval getSubmitter(PatchSet.Id patchSetId) throws Exception { - ChangeNotes notes = notesFactory.createChecked(project, patchSetId.getParentKey()).load(); + ChangeNotes notes = notesFactory.createChecked(project, patchSetId.changeId()).load(); return approvalsUtil.getSubmitter(notes, patchSetId); } diff --git a/javatests/com/google/gerrit/acceptance/rest/binding/PluginProvidedChildRestApiBindingsIT.java b/javatests/com/google/gerrit/acceptance/rest/binding/PluginProvidedChildRestApiBindingsIT.java index 27df565c75..b9c072c525 100644 --- a/javatests/com/google/gerrit/acceptance/rest/binding/PluginProvidedChildRestApiBindingsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/binding/PluginProvidedChildRestApiBindingsIT.java @@ -153,8 +153,8 @@ public class PluginProvidedChildRestApiBindingsIT extends AbstractDaemonTest { RestApiCallHelper.execute( adminRestSession, TEST_CALLS.asList(), - 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/acceptance/rest/change/AbstractSubmit.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java index 3bad8094c6..32654bd497 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java @@ -1212,7 +1212,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { assertThat(c.currentRevision).isEqualTo(expectedId.name()); assertThat(c.revisions.get(expectedId.name())._number).isEqualTo(expectedNum); try (Repository repo = repoManager.openRepository(new Project.NameKey(c.project))) { - String refName = new PatchSet.Id(new Change.Id(c._number), expectedNum).toRefName(); + String refName = PatchSet.id(new Change.Id(c._number), expectedNum).toRefName(); Ref ref = repo.exactRef(refName); assertThat(ref).named(refName).isNotNull(); assertThat(ref.getObjectId()).isEqualTo(expectedId); @@ -1260,7 +1260,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { Change c = getOnlyElement(queryProvider.get().byKeyPrefix(changeId)).change(); ChangeNotes cn = notesFactory.createChecked(c); PatchSetApproval submitter = - approvalsUtil.getSubmitter(cn, new PatchSet.Id(cn.getChangeId(), psId)); + approvalsUtil.getSubmitter(cn, PatchSet.id(cn.getChangeId(), psId)); assertThat(submitter).isNotNull(); assertThat(submitter.isLegacySubmit()).isTrue(); assertThat(submitter.getAccountId()).isEqualTo(user.id()); @@ -1270,7 +1270,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { Change c = getOnlyElement(queryProvider.get().byKeyPrefix(changeId)).change(); ChangeNotes cn = notesFactory.createChecked(c); PatchSetApproval submitter = - approvalsUtil.getSubmitter(cn, new PatchSet.Id(cn.getChangeId(), psId)); + approvalsUtil.getSubmitter(cn, PatchSet.id(cn.getChangeId(), psId)); assertThat(submitter).isNull(); } diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java index e7f3d54bb4..b6cbf50cd7 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/ActionsIT.java @@ -395,7 +395,7 @@ public class ActionsIT extends AbstractDaemonTest { // ...via ChangeJson directly. ChangeData cd = changeDataFactory.create(project, changeId); - revisionJsonFactory.create(opts).getRevisionInfo(cd, cd.patchSet(new PatchSet.Id(changeId, 1))); + revisionJsonFactory.create(opts).getRevisionInfo(cd, cd.patchSet(PatchSet.id(changeId, 1))); } private void visitedCurrentRevisionActionsAssertions( diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java index 974180c83f..4551ded87f 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java @@ -87,7 +87,7 @@ public class SubmitByFastForwardIT extends AbstractSubmit { PushOneCommit.Result change1 = createChange(); PushOneCommit.Result change2 = createChange(); - Change.Id id1 = change1.getPatchSetId().getParentKey(); + Change.Id id1 = change1.getPatchSetId().changeId(); submitWithConflict( change2.getChangeId(), "Failed to submit 2 changes due to the following problems:\n" diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java index 42ed4afeb3..5a440c1968 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java @@ -517,7 +517,7 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge { change3.getChangeId(), "Failed to submit 1 change due to the following problems:\n" + "Change " - + change3.getPatchSetId().getParentKey().get() + + change3.getPatchSetId().changeId().get() + ": Depends on change that was not submitted." + " Commit " + change3.getCommit().name() diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java index 303a85a3e5..4678827288 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java @@ -103,7 +103,7 @@ public class SubmitByRebaseAlwaysIT extends AbstractSubmitByRebase { ChangeData cd2 = changes.get(1).getChange(); assertThat(cd2.patchSets()).hasSize(2); String change1CurrentCommit = cd1.currentPatchSet().getRevision().get(); - String change2Ps1Commit = cd2.patchSet(new PatchSet.Id(cd2.getId(), 1)).getRevision().get(); + String change2Ps1Commit = cd2.patchSet(PatchSet.id(cd2.getId(), 1)).getRevision().get(); assertThat(gApi.changes().id(cd2.getId().get()).revision(2).commit(false).message) .isEqualTo( diff --git a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java index 564bd8cdff..ad172f5072 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java @@ -481,7 +481,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { "Inserted as patch set 2")); notes = reload(notes); - PatchSet.Id psId2 = new PatchSet.Id(notes.getChangeId(), 2); + PatchSet.Id psId2 = PatchSet.id(notes.getChangeId(), 2); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId2); assertThat(psUtil.get(notes, psId2).getRevision().get()).isEqualTo(mergedAs.name()); @@ -529,7 +529,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { "Inserted as patch set 2")); notes = reload(notes); - PatchSet.Id psId2 = new PatchSet.Id(notes.getChangeId(), 2); + PatchSet.Id psId2 = PatchSet.id(notes.getChangeId(), 2); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId2); assertThat(psUtil.get(notes, psId2).getRevision().get()).isEqualTo(mergedAs.name()); @@ -569,7 +569,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { "Inserted as patch set 3")); notes = reload(notes); - PatchSet.Id psId3 = new PatchSet.Id(notes.getChangeId(), 3); + PatchSet.Id psId3 = PatchSet.id(notes.getChangeId(), 3); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId3); assertThat(notes.getChange().isMerged()).isTrue(); assertThat(psUtil.byChangeAsMap(notes).keySet()).containsExactly(ps2.getId(), psId3); @@ -582,7 +582,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { PatchSet ps1 = psUtil.current(notes); // Create dangling ref so next ID in the database becomes 3. - PatchSet.Id psId2 = new PatchSet.Id(notes.getChangeId(), 2); + PatchSet.Id psId2 = PatchSet.id(notes.getChangeId(), 2); RevCommit commit2 = patchSetCommit(psId2); String rev2 = commit2.name(); serverSideTestRepo.branch(psId2.toRefName()).update(commit2); @@ -617,7 +617,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { "Inserted as patch set 4")); notes = reload(notes); - PatchSet.Id psId4 = new PatchSet.Id(notes.getChangeId(), 4); + PatchSet.Id psId4 = PatchSet.id(notes.getChangeId(), 4); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId4); assertThat(notes.getChange().isMerged()).isTrue(); assertThat(psUtil.byChangeAsMap(notes).keySet()) @@ -631,7 +631,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { PatchSet ps1 = psUtil.current(notes); // Create dangling ref with no patch set. - PatchSet.Id psId2 = new PatchSet.Id(notes.getChangeId(), 2); + PatchSet.Id psId2 = PatchSet.id(notes.getChangeId(), 2); RevCommit commit2 = patchSetCommit(psId2); String rev2 = commit2.name(); serverSideTestRepo.branch(psId2.toRefName()).update(commit2); @@ -747,7 +747,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { Change.Id id = new Change.Id(sequences.nextChangeId()); ChangeInserter ins; try (BatchUpdate bu = newUpdate(owner.id())) { - RevCommit commit = patchSetCommit(new PatchSet.Id(id, 1)); + RevCommit commit = patchSetCommit(PatchSet.id(id, 1)); bu.setNotify(NotifyResolver.Result.none()); ins = changeInserterFactory diff --git a/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java b/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java index 150c0a7ee8..8b6eab60b2 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java @@ -128,14 +128,14 @@ public class GetRelatedIT extends AbstractDaemonTest { testRepo.reset(c1_1); pushHead(testRepo, "refs/for/master", false); PatchSet.Id ps1_1 = getPatchSetId(c1_1); - String oldETag = changes.parse(ps1_1.getParentKey()).getETag(); + String oldETag = changes.parse(ps1_1.changeId()).getETag(); testRepo.reset(c2_1); pushHead(testRepo, "refs/for/master", false); PatchSet.Id ps2_1 = getPatchSetId(c2_1); // Push of change 2 should not affect groups (or anything else) of change 1. - assertThat(changes.parse(ps1_1.getParentKey()).getETag()).isEqualTo(oldETag); + assertThat(changes.parse(ps1_1.changeId()).getETag()).isEqualTo(oldETag); for (PatchSet.Id ps : ImmutableList.of(ps2_1, ps1_1)) { assertRelated(ps, changeAndCommit(ps2_1, c2_1, 1), changeAndCommit(ps1_1, c1_1, 1)); @@ -497,7 +497,7 @@ public class GetRelatedIT extends AbstractDaemonTest { PatchSet.Id ps1_1 = getPatchSetId(c1_1); PatchSet.Id ps2_1 = getPatchSetId(c2_1); - PatchSet.Id ps2_edit = new PatchSet.Id(ch2.getId(), 0); + PatchSet.Id ps2_edit = PatchSet.id(ch2.getId(), 0); PatchSet.Id ps3_1 = getPatchSetId(c3_1); for (PatchSet.Id ps : ImmutableList.of(ps1_1, ps2_1, ps3_1)) { @@ -511,7 +511,7 @@ public class GetRelatedIT extends AbstractDaemonTest { assertRelated( ps2_edit, changeAndCommit(ps3_1, c3_1, 1), - changeAndCommit(new PatchSet.Id(ch2.getId(), 0), editRev, 1), + changeAndCommit(PatchSet.id(ch2.getId(), 0), editRev, 1), changeAndCommit(ps1_1, c1_1, 1)); } @@ -532,7 +532,7 @@ public class GetRelatedIT extends AbstractDaemonTest { // Pretend PS1,1 was pushed before the groups field was added. clearGroups(psId1_1); - indexer.index(changeDataFactory.create(project, psId1_1.getParentKey())); + indexer.index(changeDataFactory.create(project, psId1_1.changeId())); // PS1,1 has no groups, so disappeared from related changes. assertRelated(psId2_1); @@ -567,7 +567,7 @@ public class GetRelatedIT extends AbstractDaemonTest { PatchSet.Id psId1_1 = getPatchSetId(c1_1); PatchSet.Id psId2_1 = getPatchSetId(c2_1); - PatchSet.Id psId2_2 = new PatchSet.Id(psId2_1.changeId, psId2_1.get() + 1); + PatchSet.Id psId2_2 = PatchSet.id(psId2_1.changeId(), psId2_1.get() + 1); assertRelated(psId2_2, changeAndCommit(psId2_2, c2_2, 2), changeAndCommit(psId1_1, c1_1, 1)); } @@ -672,7 +672,7 @@ public class GetRelatedIT extends AbstractDaemonTest { PatchSet.Id psId, ObjectId commitId, int currentRevisionNum) { RelatedChangeAndCommitInfo result = new RelatedChangeAndCommitInfo(); result.project = project.get(); - result._changeNumber = psId.getParentKey().get(); + result._changeNumber = psId.changeId().get(); result.commit = new CommitInfo(); result.commit.commit = commitId.name(); result._revisionNumber = psId.get(); @@ -684,7 +684,7 @@ public class GetRelatedIT extends AbstractDaemonTest { private void clearGroups(PatchSet.Id psId) throws Exception { try (BatchUpdate bu = batchUpdateFactory.create(project, user(user), TimeUtil.nowTs())) { bu.addOp( - psId.getParentKey(), + psId.changeId(), new BatchUpdateOp() { @Override public boolean updateChange(ChangeContext ctx) { @@ -705,7 +705,7 @@ public class GetRelatedIT extends AbstractDaemonTest { private void assertRelated(PatchSet.Id psId, List expected) throws Exception { List actual = - gApi.changes().id(psId.getParentKey().get()).revision(psId.get()).related().changes; + gApi.changes().id(psId.changeId().get()).revision(psId.get()).related().changes; assertThat(actual).named("related to " + psId).hasSize(expected.size()); for (int i = 0; i < actual.size(); i++) { String name = "index " + i + " related to " + psId; diff --git a/javatests/com/google/gerrit/common/data/LabelFunctionTest.java b/javatests/com/google/gerrit/common/data/LabelFunctionTest.java index 8d6ec58c39..141e5a0d14 100644 --- a/javatests/com/google/gerrit/common/data/LabelFunctionTest.java +++ b/javatests/com/google/gerrit/common/data/LabelFunctionTest.java @@ -33,7 +33,7 @@ public class LabelFunctionTest extends GerritBaseTests { private static final String LABEL_NAME = "Verified"; private static final LabelId LABEL_ID = LabelId.create(LABEL_NAME); private static final Change.Id CHANGE_ID = new Change.Id(100); - private static final PatchSet.Id PS_ID = new PatchSet.Id(CHANGE_ID, 1); + private static final PatchSet.Id PS_ID = PatchSet.id(CHANGE_ID, 1); private static final LabelType VERIFIED_LABEL = makeLabel(); private static final PatchSetApproval APPROVAL_2 = makeApproval(2); private static final PatchSetApproval APPROVAL_1 = makeApproval(1); diff --git a/javatests/com/google/gerrit/reviewdb/client/PatchSetApprovalTest.java b/javatests/com/google/gerrit/reviewdb/client/PatchSetApprovalTest.java index 183f1e1bf9..8e1c83581c 100644 --- a/javatests/com/google/gerrit/reviewdb/client/PatchSetApprovalTest.java +++ b/javatests/com/google/gerrit/reviewdb/client/PatchSetApprovalTest.java @@ -26,13 +26,13 @@ public class PatchSetApprovalTest extends GerritBaseTests { public void keyEquality() { PatchSetApproval.Key k1 = PatchSetApproval.key( - new PatchSet.Id(new Change.Id(1), 2), Account.id(3), LabelId.create("My-Label")); + PatchSet.id(new Change.Id(1), 2), Account.id(3), LabelId.create("My-Label")); PatchSetApproval.Key k2 = PatchSetApproval.key( - new PatchSet.Id(new Change.Id(1), 2), Account.id(3), LabelId.create("My-Label")); + PatchSet.id(new Change.Id(1), 2), Account.id(3), LabelId.create("My-Label")); PatchSetApproval.Key k3 = PatchSetApproval.key( - new PatchSet.Id(new Change.Id(1), 2), Account.id(3), LabelId.create("Other-Label")); + PatchSet.id(new Change.Id(1), 2), Account.id(3), LabelId.create("Other-Label")); assertThat(k2).isEqualTo(k1); assertThat(k3).isNotEqualTo(k1); diff --git a/javatests/com/google/gerrit/reviewdb/client/PatchSetTest.java b/javatests/com/google/gerrit/reviewdb/client/PatchSetTest.java index 90a2120baf..1e70557403 100644 --- a/javatests/com/google/gerrit/reviewdb/client/PatchSetTest.java +++ b/javatests/com/google/gerrit/reviewdb/client/PatchSetTest.java @@ -83,15 +83,14 @@ public class PatchSetTest { @Test public void toRefName() { - assertThat(new PatchSet.Id(new Change.Id(1), 23).toRefName()).isEqualTo("refs/changes/01/1/23"); - assertThat(new PatchSet.Id(new Change.Id(1234), 5).toRefName()) - .isEqualTo("refs/changes/34/1234/5"); + assertThat(PatchSet.id(new Change.Id(1), 23).toRefName()).isEqualTo("refs/changes/01/1/23"); + assertThat(PatchSet.id(new Change.Id(1234), 5).toRefName()).isEqualTo("refs/changes/34/1234/5"); } @Test public void parseId() { - assertThat(PatchSet.Id.parse("1,2")).isEqualTo(new PatchSet.Id(new Change.Id(1), 2)); - assertThat(PatchSet.Id.parse("01,02")).isEqualTo(new PatchSet.Id(new Change.Id(1), 2)); + assertThat(PatchSet.Id.parse("1,2")).isEqualTo(PatchSet.id(new Change.Id(1), 2)); + assertThat(PatchSet.Id.parse("01,02")).isEqualTo(PatchSet.id(new Change.Id(1), 2)); assertInvalidId(null); assertInvalidId(""); assertInvalidId("1"); @@ -104,13 +103,12 @@ public class PatchSetTest { @Test public void idToString() { - assertThat(new PatchSet.Id(new Change.Id(2), 3).toString()).isEqualTo("2,3"); + assertThat(PatchSet.id(new Change.Id(2), 3).toString()).isEqualTo("2,3"); } private static void assertRef(int changeId, int psId, String refName) { assertThat(PatchSet.isChangeRef(refName)).isTrue(); - assertThat(PatchSet.Id.fromRef(refName)) - .isEqualTo(new PatchSet.Id(new Change.Id(changeId), psId)); + assertThat(PatchSet.Id.fromRef(refName)).isEqualTo(PatchSet.id(new Change.Id(changeId), psId)); } private static void assertNotRef(String refName) { diff --git a/javatests/com/google/gerrit/reviewdb/client/PatchTest.java b/javatests/com/google/gerrit/reviewdb/client/PatchTest.java index f4bf6344ab..630f317e03 100644 --- a/javatests/com/google/gerrit/reviewdb/client/PatchTest.java +++ b/javatests/com/google/gerrit/reviewdb/client/PatchTest.java @@ -34,9 +34,9 @@ public class PatchTest extends GerritBaseTests { @Test public void parseKey() { assertThat(Patch.Key.parse("1,2,foo.txt")) - .isEqualTo(Patch.key(new PatchSet.Id(new Change.Id(1), 2), "foo.txt")); + .isEqualTo(Patch.key(PatchSet.id(new Change.Id(1), 2), "foo.txt")); assertThat(Patch.Key.parse("01,02,foo.txt")) - .isEqualTo(Patch.key(new PatchSet.Id(new Change.Id(1), 2), "foo.txt")); + .isEqualTo(Patch.key(PatchSet.id(new Change.Id(1), 2), "foo.txt")); assertInvalidKey(null); assertInvalidKey(""); assertInvalidKey("1,2"); diff --git a/javatests/com/google/gerrit/reviewdb/client/RefNamesTest.java b/javatests/com/google/gerrit/reviewdb/client/RefNamesTest.java index d58376c72b..6519464baa 100644 --- a/javatests/com/google/gerrit/reviewdb/client/RefNamesTest.java +++ b/javatests/com/google/gerrit/reviewdb/client/RefNamesTest.java @@ -34,7 +34,7 @@ public class RefNamesTest { private final Account.Id accountId = Account.id(1011123); private final Change.Id changeId = new Change.Id(67473); - private final PatchSet.Id psId = new PatchSet.Id(changeId, 42); + private final PatchSet.Id psId = PatchSet.id(changeId, 42); @Test public void fullName() throws Exception { diff --git a/javatests/com/google/gerrit/reviewdb/converter/ChangeMessageProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/ChangeMessageProtoConverterTest.java index 7f7bdcf996..ed95c273b4 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/ChangeMessageProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/ChangeMessageProtoConverterTest.java @@ -41,7 +41,7 @@ public class ChangeMessageProtoConverterTest { ChangeMessage.key(new Change.Id(543), "change-message-21"), Account.id(63), new Timestamp(9876543), - new PatchSet.Id(new Change.Id(34), 13)); + PatchSet.id(new Change.Id(34), 13)); changeMessage.setMessage("This is a change message."); changeMessage.setTag("An arbitrary tag."); changeMessage.setRealAuthor(Account.id(10003)); @@ -60,7 +60,7 @@ public class ChangeMessageProtoConverterTest { .setPatchset( Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(34)) - .setPatchSetId(13)) + .setId(13)) .setTag("An arbitrary tag.") .setRealAuthor(Entities.Account_Id.newBuilder().setId(10003)) .build(); @@ -74,7 +74,7 @@ public class ChangeMessageProtoConverterTest { ChangeMessage.key(new Change.Id(543), "change-message-21"), Account.id(63), new Timestamp(9876543), - new PatchSet.Id(new Change.Id(34), 13)); + PatchSet.id(new Change.Id(34), 13)); Entities.ChangeMessage proto = changeMessageProtoConverter.toProto(changeMessage); @@ -89,7 +89,7 @@ public class ChangeMessageProtoConverterTest { .setPatchset( Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(34)) - .setPatchSetId(13)) + .setId(13)) .build(); assertThat(proto).isEqualTo(expectedProto); } @@ -141,7 +141,7 @@ public class ChangeMessageProtoConverterTest { ChangeMessage.key(new Change.Id(543), "change-message-21"), Account.id(63), new Timestamp(9876543), - new PatchSet.Id(new Change.Id(34), 13)); + PatchSet.id(new Change.Id(34), 13)); changeMessage.setMessage("This is a change message."); changeMessage.setTag("An arbitrary tag."); changeMessage.setRealAuthor(Account.id(10003)); @@ -158,7 +158,7 @@ public class ChangeMessageProtoConverterTest { ChangeMessage.key(new Change.Id(543), "change-message-21"), Account.id(63), new Timestamp(9876543), - new PatchSet.Id(new Change.Id(34), 13)); + PatchSet.id(new Change.Id(34), 13)); ChangeMessage convertedChangeMessage = changeMessageProtoConverter.fromProto(changeMessageProtoConverter.toProto(changeMessage)); diff --git a/javatests/com/google/gerrit/reviewdb/converter/ChangeProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/ChangeProtoConverterTest.java index a1e6e4b1c4..7ab1aacd94 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/ChangeProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/ChangeProtoConverterTest.java @@ -46,7 +46,7 @@ public class ChangeProtoConverterTest { change.setLastUpdatedOn(new Timestamp(1234567L)); change.setStatus(Change.Status.MERGED); change.setCurrentPatchSet( - new PatchSet.Id(new Change.Id(14), 23), "subject XYZ", "original subject ABC"); + PatchSet.id(new Change.Id(14), 23), "subject XYZ", "original subject ABC"); change.setTopic("my topic"); change.setSubmissionId("submission ID 234"); change.setAssignee(Account.id(100001)); @@ -130,7 +130,7 @@ public class ChangeProtoConverterTest { Branch.nameKey(new Project.NameKey("project 67"), "branch-74"), new Timestamp(987654L)); // O as ID actually means that no current patch set is present. - change.setCurrentPatchSet(new PatchSet.Id(new Change.Id(14), 0), null, null); + change.setCurrentPatchSet(PatchSet.id(new Change.Id(14), 0), null, null); Entities.Change proto = changeProtoConverter.toProto(change); @@ -167,7 +167,7 @@ public class ChangeProtoConverterTest { Account.id(35), Branch.nameKey(new Project.NameKey("project 67"), "branch-74"), new Timestamp(987654L)); - change.setCurrentPatchSet(new PatchSet.Id(new Change.Id(14), 23), "subject ABC", null); + change.setCurrentPatchSet(PatchSet.id(new Change.Id(14), 23), "subject ABC", null); Entities.Change proto = changeProtoConverter.toProto(change); @@ -207,7 +207,7 @@ public class ChangeProtoConverterTest { change.setLastUpdatedOn(new Timestamp(1234567L)); change.setStatus(Change.Status.MERGED); change.setCurrentPatchSet( - new PatchSet.Id(new Change.Id(14), 23), "subject XYZ", "original subject ABC"); + PatchSet.id(new Change.Id(14), 23), "subject XYZ", "original subject ABC"); change.setTopic("my topic"); change.setSubmissionId("submission ID 234"); change.setAssignee(Account.id(100001)); diff --git a/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalKeyProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalKeyProtoConverterTest.java index c156a67e0f..5b7b10113e 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalKeyProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalKeyProtoConverterTest.java @@ -38,7 +38,7 @@ public class PatchSetApprovalKeyProtoConverterTest { public void allValuesConvertedToProto() { PatchSetApproval.Key key = PatchSetApproval.key( - new PatchSet.Id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")); + PatchSet.id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")); Entities.PatchSetApproval_Key proto = protoConverter.toProto(key); @@ -47,7 +47,7 @@ public class PatchSetApprovalKeyProtoConverterTest { .setPatchSetId( Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(42)) - .setPatchSetId(14)) + .setId(14)) .setAccountId(Entities.Account_Id.newBuilder().setId(100013)) .setLabelId(Entities.LabelId.newBuilder().setId("label-8")) .build(); @@ -58,7 +58,7 @@ public class PatchSetApprovalKeyProtoConverterTest { public void allValuesConvertedToProtoAndBackAgain() { PatchSetApproval.Key key = PatchSetApproval.key( - new PatchSet.Id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")); + PatchSet.id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")); PatchSetApproval.Key convertedKey = protoConverter.fromProto(protoConverter.toProto(key)); @@ -72,7 +72,7 @@ public class PatchSetApprovalKeyProtoConverterTest { .setPatchSetId( Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(42)) - .setPatchSetId(14)) + .setId(14)) .setAccountId(Entities.Account_Id.newBuilder().setId(100013)) .setLabelId(Entities.LabelId.newBuilder().setId("label-8")) .build(); diff --git a/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalProtoConverterTest.java index f262f7e402..10ea092e6f 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/PatchSetApprovalProtoConverterTest.java @@ -41,9 +41,7 @@ public class PatchSetApprovalProtoConverterTest { PatchSetApproval patchSetApproval = new PatchSetApproval( PatchSetApproval.key( - new PatchSet.Id(new Change.Id(42), 14), - Account.id(100013), - LabelId.create("label-8")), + PatchSet.id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")), (short) 456, new Date(987654L)); patchSetApproval.setTag("tag-21"); @@ -59,7 +57,7 @@ public class PatchSetApprovalProtoConverterTest { .setPatchSetId( Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(42)) - .setPatchSetId(14)) + .setId(14)) .setAccountId(Entities.Account_Id.newBuilder().setId(100013)) .setLabelId(Entities.LabelId.newBuilder().setId("label-8"))) .setValue(456) @@ -76,9 +74,7 @@ public class PatchSetApprovalProtoConverterTest { PatchSetApproval patchSetApproval = new PatchSetApproval( PatchSetApproval.key( - new PatchSet.Id(new Change.Id(42), 14), - Account.id(100013), - LabelId.create("label-8")), + PatchSet.id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")), (short) 456, new Date(987654L)); @@ -91,7 +87,7 @@ public class PatchSetApprovalProtoConverterTest { .setPatchSetId( Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(42)) - .setPatchSetId(14)) + .setId(14)) .setAccountId(Entities.Account_Id.newBuilder().setId(100013)) .setLabelId(Entities.LabelId.newBuilder().setId("label-8"))) .setValue(456) @@ -107,9 +103,7 @@ public class PatchSetApprovalProtoConverterTest { PatchSetApproval patchSetApproval = new PatchSetApproval( PatchSetApproval.key( - new PatchSet.Id(new Change.Id(42), 14), - Account.id(100013), - LabelId.create("label-8")), + PatchSet.id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")), (short) 456, new Date(987654L)); patchSetApproval.setTag("tag-21"); @@ -126,9 +120,7 @@ public class PatchSetApprovalProtoConverterTest { PatchSetApproval patchSetApproval = new PatchSetApproval( PatchSetApproval.key( - new PatchSet.Id(new Change.Id(42), 14), - Account.id(100013), - LabelId.create("label-8")), + PatchSet.id(new Change.Id(42), 14), Account.id(100013), LabelId.create("label-8")), (short) 456, new Date(987654L)); @@ -148,13 +140,13 @@ public class PatchSetApprovalProtoConverterTest { .setPatchSetId( Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(42)) - .setPatchSetId(14)) + .setId(14)) .setAccountId(Entities.Account_Id.newBuilder().setId(100013)) .setLabelId(Entities.LabelId.newBuilder().setId("label-8"))) .build(); PatchSetApproval patchSetApproval = protoConverter.fromProto(proto); - assertThat(patchSetApproval.getPatchSetId()).isEqualTo(new PatchSet.Id(new Change.Id(42), 14)); + assertThat(patchSetApproval.getPatchSetId()).isEqualTo(PatchSet.id(new Change.Id(42), 14)); assertThat(patchSetApproval.getAccountId()).isEqualTo(Account.id(100013)); assertThat(patchSetApproval.getLabelId()).isEqualTo(LabelId.create("label-8")); // Default values for unset protobuf fields which can't be unset in the entity object. @@ -172,7 +164,7 @@ public class PatchSetApprovalProtoConverterTest { .setPatchSetId( Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(42)) - .setPatchSetId(14)) + .setId(14)) .setAccountId(Entities.Account_Id.newBuilder().setId(100013)) .setLabelId(Entities.LabelId.newBuilder().setId("label-8"))) .setValue(456) diff --git a/javatests/com/google/gerrit/reviewdb/converter/PatchSetIdProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/PatchSetIdProtoConverterTest.java index 1598ef2ce5..4b28a48d30 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/PatchSetIdProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/PatchSetIdProtoConverterTest.java @@ -33,21 +33,21 @@ public class PatchSetIdProtoConverterTest { @Test public void allValuesConvertedToProto() { - PatchSet.Id patchSetId = new PatchSet.Id(new Change.Id(103), 73); + PatchSet.Id patchSetId = PatchSet.id(new Change.Id(103), 73); Entities.PatchSet_Id proto = patchSetIdProtoConverter.toProto(patchSetId); Entities.PatchSet_Id expectedProto = Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(103)) - .setPatchSetId(73) + .setId(73) .build(); assertThat(proto).isEqualTo(expectedProto); } @Test public void allValuesConvertedToProtoAndBackAgain() { - PatchSet.Id patchSetId = new PatchSet.Id(new Change.Id(20), 13); + PatchSet.Id patchSetId = PatchSet.id(new Change.Id(20), 13); PatchSet.Id convertedPatchSetId = patchSetIdProtoConverter.fromProto(patchSetIdProtoConverter.toProto(patchSetId)); @@ -60,7 +60,7 @@ public class PatchSetIdProtoConverterTest { Entities.PatchSet_Id proto = Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(103)) - .setPatchSetId(73) + .setId(73) .build(); byte[] bytes = proto.toByteArray(); @@ -72,12 +72,12 @@ public class PatchSetIdProtoConverterTest { /** See {@link SerializedClassSubject} for background and what to do if this test fails. */ @Test - public void fieldsExistAsExpected() { + public void methodsExistAsExpected() { assertThatSerializedClass(PatchSet.Id.class) - .hasFields( + .hasAutoValueMethods( ImmutableMap.builder() .put("changeId", Change.Id.class) - .put("patchSetId", int.class) + .put("id", int.class) .build()); } } diff --git a/javatests/com/google/gerrit/reviewdb/converter/PatchSetProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/PatchSetProtoConverterTest.java index 187e4b1293..a641eaf79d 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/PatchSetProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/PatchSetProtoConverterTest.java @@ -36,7 +36,7 @@ public class PatchSetProtoConverterTest { @Test public void allValuesConvertedToProto() { - PatchSet patchSet = new PatchSet(new PatchSet.Id(new Change.Id(103), 73)); + PatchSet patchSet = new PatchSet(PatchSet.id(new Change.Id(103), 73)); patchSet.setRevision(new RevId("aabbccddeeff")); patchSet.setUploader(Account.id(452)); patchSet.setCreatedOn(new Timestamp(930349320L)); @@ -51,7 +51,7 @@ public class PatchSetProtoConverterTest { .setId( Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(103)) - .setPatchSetId(73)) + .setId(73)) .setRevision(Entities.RevId.newBuilder().setId("aabbccddeeff")) .setUploaderAccountId(Entities.Account_Id.newBuilder().setId(452)) .setCreatedOn(930349320L) @@ -64,7 +64,7 @@ public class PatchSetProtoConverterTest { @Test public void mandatoryValuesConvertedToProto() { - PatchSet patchSet = new PatchSet(new PatchSet.Id(new Change.Id(103), 73)); + PatchSet patchSet = new PatchSet(PatchSet.id(new Change.Id(103), 73)); Entities.PatchSet proto = patchSetProtoConverter.toProto(patchSet); @@ -73,14 +73,14 @@ public class PatchSetProtoConverterTest { .setId( Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(103)) - .setPatchSetId(73)) + .setId(73)) .build(); assertThat(proto).isEqualTo(expectedProto); } @Test public void allValuesConvertedToProtoAndBackAgain() { - PatchSet patchSet = new PatchSet(new PatchSet.Id(new Change.Id(103), 73)); + PatchSet patchSet = new PatchSet(PatchSet.id(new Change.Id(103), 73)); patchSet.setRevision(new RevId("aabbccddeeff")); patchSet.setUploader(Account.id(452)); patchSet.setCreatedOn(new Timestamp(930349320L)); @@ -95,7 +95,7 @@ public class PatchSetProtoConverterTest { @Test public void mandatoryValuesConvertedToProtoAndBackAgain() { - PatchSet patchSet = new PatchSet(new PatchSet.Id(new Change.Id(103), 73)); + PatchSet patchSet = new PatchSet(PatchSet.id(new Change.Id(103), 73)); PatchSet convertedPatchSet = patchSetProtoConverter.fromProto(patchSetProtoConverter.toProto(patchSet)); @@ -109,7 +109,7 @@ public class PatchSetProtoConverterTest { .setId( Entities.PatchSet_Id.newBuilder() .setChangeId(Entities.Change_Id.newBuilder().setId(103)) - .setPatchSetId(73)) + .setId(73)) .build(); byte[] bytes = proto.toByteArray(); diff --git a/javatests/com/google/gerrit/server/change/WalkSorterTest.java b/javatests/com/google/gerrit/server/change/WalkSorterTest.java index bf2ef01d64..96862eafb7 100644 --- a/javatests/com/google/gerrit/server/change/WalkSorterTest.java +++ b/javatests/com/google/gerrit/server/change/WalkSorterTest.java @@ -280,7 +280,7 @@ public class WalkSorterTest extends GerritBaseTests { // If we restrict to PS1 of each change, the sorter uses that commit. sorter.includePatchSets( - ImmutableSet.of(new PatchSet.Id(cd1.getId(), 1), new PatchSet.Id(cd2.getId(), 1))); + ImmutableSet.of(PatchSet.id(cd1.getId(), 1), PatchSet.id(cd2.getId(), 1))); assertSorted( sorter, changes, ImmutableList.of(patchSetData(cd2, 1, c2_1), patchSetData(cd1, 1, c1_1))); } @@ -362,7 +362,7 @@ public class WalkSorterTest extends GerritBaseTests { private static PatchSetData patchSetData(ChangeData cd, int psId, RevCommit commit) throws Exception { - return PatchSetData.create(cd, cd.patchSet(new PatchSet.Id(cd.getId(), psId)), commit); + return PatchSetData.create(cd, cd.patchSet(PatchSet.id(cd.getId(), psId)), commit); } private static void assertSorted( diff --git a/javatests/com/google/gerrit/server/edit/ChangeEditTest.java b/javatests/com/google/gerrit/server/edit/ChangeEditTest.java index 25a3598750..86a315387c 100644 --- a/javatests/com/google/gerrit/server/edit/ChangeEditTest.java +++ b/javatests/com/google/gerrit/server/edit/ChangeEditTest.java @@ -28,7 +28,7 @@ public class ChangeEditTest extends GerritBaseTests { public void changeEditRef() throws Exception { Account.Id accountId = Account.id(1000042); Change.Id changeId = new Change.Id(56414); - PatchSet.Id psId = new PatchSet.Id(changeId, 50); + PatchSet.Id psId = PatchSet.id(changeId, 50); String refName = RefNames.refsEdit(accountId, changeId, psId); assertEquals("refs/users/42/1000042/edit-56414/50", refName); } diff --git a/javatests/com/google/gerrit/server/git/GroupCollectorTest.java b/javatests/com/google/gerrit/server/git/GroupCollectorTest.java index f6942999e5..222e04ba46 100644 --- a/javatests/com/google/gerrit/server/git/GroupCollectorTest.java +++ b/javatests/com/google/gerrit/server/git/GroupCollectorTest.java @@ -285,7 +285,7 @@ public class GroupCollectorTest extends GerritBaseTests { // TODO(dborowitz): Tests for octopus merges. private static PatchSet.Id psId(int c, int p) { - return new PatchSet.Id(new Change.Id(c), p); + return PatchSet.id(new Change.Id(c), p); } private RevWalk newWalk(ObjectId start, ObjectId branchTip) throws Exception { diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java index 11d9ae2801..71ad2da9b4 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java @@ -168,7 +168,7 @@ public class ChangeNotesStateTest extends GerritBaseTests { public void serializeCurrentPatchSetId() throws Exception { assertRoundTrip( newBuilder() - .columns(cols.toBuilder().currentPatchSetId(new PatchSet.Id(ID, 2)).build()) + .columns(cols.toBuilder().currentPatchSetId(PatchSet.id(ID, 2)).build()) .build(), ChangeNotesStateProto.newBuilder() .setMetaId(SHA_BYTES) @@ -334,14 +334,14 @@ public class ChangeNotesStateTest extends GerritBaseTests { @Test public void serializePatchSets() throws Exception { - PatchSet ps1 = new PatchSet(new PatchSet.Id(ID, 1)); + PatchSet ps1 = new PatchSet(PatchSet.id(ID, 1)); ps1.setUploader(Account.id(2000)); ps1.setRevision(new RevId("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")); ps1.setCreatedOn(cols.createdOn()); ByteString ps1Bytes = toByteString(ps1, PatchSetProtoConverter.INSTANCE); assertThat(ps1Bytes.size()).isEqualTo(66); - PatchSet ps2 = new PatchSet(new PatchSet.Id(ID, 2)); + PatchSet ps2 = new PatchSet(PatchSet.id(ID, 2)); ps2.setUploader(Account.id(3000)); ps2.setRevision(new RevId("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb")); ps2.setCreatedOn(cols.lastUpdatedOn()); @@ -367,7 +367,7 @@ public class ChangeNotesStateTest extends GerritBaseTests { PatchSetApproval a1 = new PatchSetApproval( PatchSetApproval.key( - new PatchSet.Id(ID, 1), Account.id(2001), LabelId.create("Code-Review")), + PatchSet.id(ID, 1), Account.id(2001), LabelId.create("Code-Review")), (short) 1, new Timestamp(1212L)); ByteString a1Bytes = toByteString(a1, PatchSetApprovalProtoConverter.INSTANCE); @@ -375,8 +375,7 @@ public class ChangeNotesStateTest extends GerritBaseTests { PatchSetApproval a2 = new PatchSetApproval( - PatchSetApproval.key( - new PatchSet.Id(ID, 1), Account.id(2002), LabelId.create("Verified")), + PatchSetApproval.key(PatchSet.id(ID, 1), Account.id(2002), LabelId.create("Verified")), (short) -1, new Timestamp(3434L)); ByteString a2Bytes = toByteString(a2, PatchSetApprovalProtoConverter.INSTANCE); @@ -628,7 +627,7 @@ public class ChangeNotesStateTest extends GerritBaseTests { ChangeMessage.key(ID, "uuid1"), Account.id(1000), new Timestamp(1212L), - new PatchSet.Id(ID, 1)); + PatchSet.id(ID, 1)); ByteString m1Bytes = toByteString(m1, ChangeMessageProtoConverter.INSTANCE); assertThat(m1Bytes.size()).isEqualTo(35); @@ -637,7 +636,7 @@ public class ChangeNotesStateTest extends GerritBaseTests { ChangeMessage.key(ID, "uuid2"), Account.id(2000), new Timestamp(3434L), - new PatchSet.Id(ID, 2)); + PatchSet.id(ID, 2)); ByteString m2Bytes = toByteString(m2, ChangeMessageProtoConverter.INSTANCE); assertThat(m2Bytes.size()).isEqualTo(35); assertThat(m2Bytes).isNotEqualTo(m1Bytes); diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java index cf73061c23..bf5860718a 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java @@ -1014,14 +1014,14 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { assertThat(notes.getChange().currentPatchSetId()).isEqualTo(ps1.getId()); assertThat(notes.getChange().getSubject()).isEqualTo("Change subject"); assertThat(notes.getChange().getOriginalSubject()).isEqualTo("Change subject"); - assertThat(ps1.getId()).isEqualTo(new PatchSet.Id(c.getId(), 1)); + assertThat(ps1.getId()).isEqualTo(PatchSet.id(c.getId(), 1)); assertThat(ps1.getUploader()).isEqualTo(changeOwner.getAccountId()); // ps2 by other user RevCommit commit = incrementPatchSet(c, otherUser); notes = newNotes(c); PatchSet ps2 = notes.getCurrentPatchSet(); - assertThat(ps2.getId()).isEqualTo(new PatchSet.Id(c.getId(), 2)); + assertThat(ps2.getId()).isEqualTo(PatchSet.id(c.getId(), 2)); assertThat(notes.getChange().getSubject()).isEqualTo("PS2"); assertThat(notes.getChange().getOriginalSubject()).isEqualTo("Change subject"); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(ps2.getId()); @@ -2696,7 +2696,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { int numComments = notes.getComments().size(); ChangeUpdate update = newUpdate(c, changeOwner); - update.setPatchSetId(new PatchSet.Id(c.getId(), c.currentPatchSetId().get() + 1)); + update.setPatchSetId(PatchSet.id(c.getId(), c.currentPatchSetId().get() + 1)); update.setChangeMessage("Should be ignored"); update.putApproval("Code-Review", (short) 2); CommentRange range = new CommentRange(1, 1, 2, 1); @@ -2733,7 +2733,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { assertThat(newNotes(c).getChange().currentPatchSetId().get()).isEqualTo(2); ChangeUpdate update = newUpdate(c, changeOwner); - update.setPatchSetId(new PatchSet.Id(c.getId(), 1)); + update.setPatchSetId(PatchSet.id(c.getId(), 1)); update.setCurrentPatchSet(); update.commit(); assertThat(newNotes(c).getChange().currentPatchSetId().get()).isEqualTo(1); @@ -2750,7 +2750,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { // Delete PS1, PS2 becomes current. update = newUpdate(c, changeOwner); - update.setPatchSetId(new PatchSet.Id(c.getId(), 1)); + update.setPatchSetId(PatchSet.id(c.getId(), 1)); update.setPatchSetState(PatchSetState.DELETED); update.commit(); assertThat(newNotes(c).getChange().currentPatchSetId().get()).isEqualTo(2); diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 36f9f7eb50..7c7c75a5e0 100644 --- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -2435,7 +2435,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { public void byCommitsOnBranchNotMergedSkipsMissingChanges() throws Exception { TestRepository repo = createProject("repo"); ObjectId missing = - repo.branch(new PatchSet.Id(new Change.Id(987654), 1).toRefName()) + repo.branch(PatchSet.id(new Change.Id(987654), 1).toRefName()) .commit() .message("No change for this commit") .insertChangeId() @@ -3254,7 +3254,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { PatchSetInserter inserter = patchSetFactory - .create(changeNotesFactory.createChecked(c), new PatchSet.Id(c.getId(), n), commit) + .create(changeNotesFactory.createChecked(c), PatchSet.id(c.getId(), n), commit) .setFireRevisionCreated(false) .setValidate(false); try (BatchUpdate bu = updateFactory.create(c.getProject(), user, TimeUtil.nowTs()); diff --git a/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java b/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java index d77cbcdce8..666b93fb77 100644 --- a/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java +++ b/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java @@ -33,8 +33,8 @@ public class ChangeDataTest extends GerritBaseTests { cd.setChange(TestChanges.newChange(project, Account.id(1000))); PatchSet curr1 = cd.currentPatchSet(); int currId = curr1.getId().get(); - PatchSet ps1 = new PatchSet(new PatchSet.Id(cd.getId(), currId + 1)); - PatchSet ps2 = new PatchSet(new PatchSet.Id(cd.getId(), currId + 2)); + PatchSet ps1 = new PatchSet(PatchSet.id(cd.getId(), currId + 1)); + PatchSet ps2 = new PatchSet(PatchSet.id(cd.getId(), currId + 2)); cd.setPatchSets(ImmutableList.of(ps1, ps2)); PatchSet curr2 = cd.currentPatchSet(); assertThat(curr2).isNotSameInstanceAs(curr1); diff --git a/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java b/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java index a0d0f3c05d..3a377e2526 100644 --- a/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java +++ b/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java @@ -34,7 +34,7 @@ import org.junit.Test; public class IgnoreSelfApprovalRuleTest extends GerritBaseTests { private static final Change.Id CHANGE_ID = new Change.Id(100); - private static final PatchSet.Id PS_ID = new PatchSet.Id(CHANGE_ID, 1); + private static final PatchSet.Id PS_ID = PatchSet.id(CHANGE_ID, 1); private static final LabelType VERIFIED = makeLabel("Verified"); private static final Account.Id USER1 = makeAccount(100001); diff --git a/javatests/com/google/gerrit/server/update/BatchUpdateTest.java b/javatests/com/google/gerrit/server/update/BatchUpdateTest.java index fe30901f27..ffaf255f26 100644 --- a/javatests/com/google/gerrit/server/update/BatchUpdateTest.java +++ b/javatests/com/google/gerrit/server/update/BatchUpdateTest.java @@ -124,8 +124,8 @@ public class BatchUpdateTest extends GerritBaseTests { ObjectId oldMetaId = getMetaId(id); try (BatchUpdate bu = batchUpdateFactory.create(project, user.get(), TimeUtil.nowTs())) { - bu.addOp(id, new AddMessageOp("Update on PS1", new PatchSet.Id(id, 1))); - bu.addOp(id, new AddMessageOp("Update on PS2", new PatchSet.Id(id, 2))); + bu.addOp(id, new AddMessageOp("Update on PS1", PatchSet.id(id, 1))); + bu.addOp(id, new AddMessageOp("Update on PS2", PatchSet.id(id, 2))); try { bu.execute(); assert_().fail("expected ResourceConflictException"); @@ -193,7 +193,7 @@ public class BatchUpdateTest extends GerritBaseTests { Change.Id id = createChangeWithTwoPatchSets(MAX_UPDATES - 1); ObjectId oldMetaId = getMetaId(id); try (BatchUpdate bu = batchUpdateFactory.create(project, user.get(), TimeUtil.nowTs())) { - bu.addOp(id, new AddMessageOp("Message on PS1", new PatchSet.Id(id, 1))); + bu.addOp(id, new AddMessageOp("Message on PS1", PatchSet.id(id, 1))); bu.addOp(id, new SubmitOp()); bu.execute(); } @@ -258,7 +258,7 @@ public class BatchUpdateTest extends GerritBaseTests { bu.addOp( id, patchSetInserterFactory - .create(notes, new PatchSet.Id(id, 2), commitId) + .create(notes, PatchSet.id(id, 2), commitId) .setMessage("Add PS2")); bu.execute(); } diff --git a/plugins/reviewnotes b/plugins/reviewnotes index 826c76a2bd..f851afa249 160000 --- a/plugins/reviewnotes +++ b/plugins/reviewnotes @@ -1 +1 @@ -Subproject commit 826c76a2bd25e445c526a6008b5525624b060b20 +Subproject commit f851afa24966cc4d1011d67b8089069665e9dc98 diff --git a/proto/entities.proto b/proto/entities.proto index 0855265607..f263a2b161 100644 --- a/proto/entities.proto +++ b/proto/entities.proto @@ -84,7 +84,7 @@ message ChangeMessage { // Next ID: 3 message PatchSet_Id { required Change_Id change_id = 1; - required int32 patch_set_id = 2; + required int32 id = 2; } // Serialized form of com.google.gerrit.reviewdb.client.PatchSet.