diff --git a/java/com/google/gerrit/httpd/raw/CatServlet.java b/java/com/google/gerrit/httpd/raw/CatServlet.java index 0accdb8eb1..a4538cf020 100644 --- a/java/com/google/gerrit/httpd/raw/CatServlet.java +++ b/java/com/google/gerrit/httpd/raw/CatServlet.java @@ -139,7 +139,7 @@ public class CatServlet extends HttpServlet { rsp.sendError(HttpServletResponse.SC_NOT_FOUND); return; } - revision = patchSet.getCommitId().name(); + revision = patchSet.commitId().name(); } } catch (ResourceConflictException | NoSuchChangeException | AuthException e) { rsp.sendError(HttpServletResponse.SC_NOT_FOUND); diff --git a/java/com/google/gerrit/reviewdb/client/PatchSet.java b/java/com/google/gerrit/reviewdb/client/PatchSet.java index 4ebdc1fac0..7c0af0ffde 100644 --- a/java/com/google/gerrit/reviewdb/client/PatchSet.java +++ b/java/com/google/gerrit/reviewdb/client/PatchSet.java @@ -79,7 +79,7 @@ public abstract class PatchSet { checkArgument(test, "invalid patch set ID: %s", input); } - /** Parse a PatchSet.Id from a {@link #getRefName()} result. */ + /** Parse a PatchSet.Id from a {@link #refName()} result. */ public static Id fromRef(String ref) { int cs = Change.Id.startIndex(ref); if (cs < 0) { @@ -142,11 +142,11 @@ public abstract class PatchSet { public abstract static class Builder { public abstract Builder id(Id id); - public abstract Id getId(); + public abstract Id id(); public abstract Builder commitId(ObjectId commitId); - public abstract Optional getCommitId(); + public abstract Optional commitId(); public abstract Builder uploader(Account.Id uploader); @@ -154,7 +154,7 @@ public abstract class PatchSet { public abstract Builder groups(Iterable groups); - public abstract ImmutableList getGroups(); + public abstract ImmutableList groups(); public abstract Builder pushCertificate(Optional pushCertificate); @@ -164,13 +164,13 @@ public abstract class PatchSet { public abstract Builder description(String description); - public abstract Optional getDescription(); + public abstract Optional description(); public abstract PatchSet build(); } /** ID of the patch set. */ - public abstract Id getId(); + public abstract Id id(); /** * Commit ID of the patch set, also known as the revision. @@ -179,7 +179,7 @@ public abstract class PatchSet { * Gerrit, and the old data erroneously did not include a {@code commitId}, then this method will * return {@link ObjectId#zeroId()}. */ - public abstract ObjectId getCommitId(); + public abstract ObjectId commitId(); /** * Account that uploaded the patch set. @@ -188,7 +188,7 @@ public abstract class PatchSet { * Gerrit, and the old data erroneously did not include an {@code uploader}, then this method will * return an account ID of 0. */ - public abstract Account.Id getUploader(); + public abstract Account.Id uploader(); /** * When this patch set was first introduced onto the change. @@ -197,7 +197,7 @@ public abstract class PatchSet { * Gerrit, and the old data erroneously did not include a {@code createdOn}, then this method will * return a timestamp of 0. */ - public abstract Timestamp getCreatedOn(); + public abstract Timestamp createdOn(); /** * Opaque group identifier, usually assigned during creation. @@ -208,10 +208,10 @@ public abstract class PatchSet { *

Changes on the same branch having patch sets with intersecting groups are considered * related, as in the "Related Changes" tab. */ - public abstract ImmutableList getGroups(); + public abstract ImmutableList groups(); /** Certificate sent with a push that created this patch set. */ - public abstract Optional getPushCertificate(); + public abstract Optional pushCertificate(); /** * Optional user-supplied description for this patch set. @@ -219,15 +219,15 @@ public abstract class PatchSet { *

When this field is an empty {@code Optional}, the description was never set on the patch * set. When this field is present but an empty string, the description was set and later cleared. */ - public abstract Optional getDescription(); + public abstract Optional description(); /** Patch set number. */ - public int getPatchSetId() { - return getId().get(); + public int number() { + return id().get(); } /** Name of the corresponding patch set ref. */ - public String getRefName() { - return getId().toRefName(); + public String refName() { + return id().toRefName(); } } diff --git a/java/com/google/gerrit/reviewdb/converter/PatchSetProtoConverter.java b/java/com/google/gerrit/reviewdb/converter/PatchSetProtoConverter.java index 8a4a37088f..f9ed8efb25 100644 --- a/java/com/google/gerrit/reviewdb/converter/PatchSetProtoConverter.java +++ b/java/com/google/gerrit/reviewdb/converter/PatchSetProtoConverter.java @@ -37,16 +37,16 @@ public enum PatchSetProtoConverter implements ProtoConverter groups = patchSet.getGroups(); + .setId(patchSetIdConverter.toProto(patchSet.id())) + .setCommitId(objectIdConverter.toProto(patchSet.commitId())) + .setUploaderAccountId(accountIdConverter.toProto(patchSet.uploader())) + .setCreatedOn(patchSet.createdOn().getTime()); + List groups = patchSet.groups(); if (!groups.isEmpty()) { builder.setGroups(PatchSet.joinGroups(groups)); } - patchSet.getPushCertificate().ifPresent(builder::setPushCertificate); - patchSet.getDescription().ifPresent(builder::setDescription); + patchSet.pushCertificate().ifPresent(builder::setPushCertificate); + patchSet.description().ifPresent(builder::setDescription); return builder.build(); } diff --git a/java/com/google/gerrit/server/ApprovalCopier.java b/java/com/google/gerrit/server/ApprovalCopier.java index 3ee6d94661..285c20bd5b 100644 --- a/java/com/google/gerrit/server/ApprovalCopier.java +++ b/java/com/google/gerrit/server/ApprovalCopier.java @@ -108,7 +108,7 @@ public class ApprovalCopier { } Table byUser = HashBasedTable.create(); - for (PatchSetApproval psa : all.get(ps.getId())) { + for (PatchSetApproval psa : all.get(ps.id())) { if (!wontCopy.contains(psa.getLabel(), psa.getAccountId())) { byUser.put(psa.getLabel(), psa.getAccountId(), psa); } @@ -118,16 +118,16 @@ public class ApprovalCopier { // Walk patch sets strictly less than current in descending order. Collection allPrior = - patchSets.descendingMap().tailMap(ps.getId().get(), false).values(); + patchSets.descendingMap().tailMap(ps.id().get(), false).values(); for (PatchSet priorPs : allPrior) { - List priorApprovals = all.get(priorPs.getId()); + List priorApprovals = all.get(priorPs.id()); if (priorApprovals.isEmpty()) { continue; } ChangeKind kind = changeKindCache.getChangeKind( - project.getNameKey(), rw, repoConfig, priorPs.getCommitId(), ps.getCommitId()); + project.getNameKey(), rw, repoConfig, priorPs.commitId(), ps.commitId()); for (PatchSetApproval psa : priorApprovals) { if (wontCopy.contains(psa.getLabel(), psa.getAccountId())) { @@ -136,11 +136,11 @@ public class ApprovalCopier { if (byUser.contains(psa.getLabel(), psa.getAccountId())) { continue; } - if (!canCopy(project, psa, ps.getId(), kind)) { + if (!canCopy(project, psa, ps.id(), kind)) { wontCopy.put(psa.getLabel(), psa.getAccountId(), psa); continue; } - byUser.put(psa.getLabel(), psa.getAccountId(), copy(psa, ps.getId())); + byUser.put(psa.getLabel(), psa.getAccountId(), copy(psa, ps.id())); } } return labelNormalizer.normalize(notes, byUser.values()).getNormalized(); @@ -153,7 +153,7 @@ public class ApprovalCopier { Collection patchSets = cd.patchSets(); TreeMap result = new TreeMap<>(); for (PatchSet ps : patchSets) { - result.put(ps.getId().get(), ps); + result.put(ps.id().get(), ps); } return result; } diff --git a/java/com/google/gerrit/server/ApprovalsUtil.java b/java/com/google/gerrit/server/ApprovalsUtil.java index 05c512303c..a9dd2f205c 100644 --- a/java/com/google/gerrit/server/ApprovalsUtil.java +++ b/java/com/google/gerrit/server/ApprovalsUtil.java @@ -147,7 +147,7 @@ public class ApprovalsUtil { update, labelTypes, change, - ps.getId(), + ps.id(), info.getAuthor().getAccount(), info.getCommitter().getAccount(), wantReviewers, @@ -274,10 +274,10 @@ public class ApprovalsUtil { throws RestApiException, PermissionBackendException { Account.Id accountId = user.getAccountId(); checkArgument( - accountId.equals(ps.getUploader()), + accountId.equals(ps.uploader()), "expected user %s to match patch set uploader %s", accountId, - ps.getUploader()); + ps.uploader()); if (approvals.isEmpty()) { return ImmutableList.of(); } @@ -286,7 +286,7 @@ public class ApprovalsUtil { Date ts = update.getWhen(); for (Map.Entry vote : approvals.entrySet()) { LabelType lt = labelTypes.byLabel(vote.getKey()); - cells.add(newApproval(ps.getId(), user, lt.getLabelId(), vote.getValue(), ts)); + cells.add(newApproval(ps.id(), user, lt.getLabelId(), vote.getValue(), ts)); } for (PatchSetApproval psa : cells) { update.putApproval(psa.getLabel(), psa.getValue()); diff --git a/java/com/google/gerrit/server/ChangeUtil.java b/java/com/google/gerrit/server/ChangeUtil.java index 73013a60bc..8c207a88c5 100644 --- a/java/com/google/gerrit/server/ChangeUtil.java +++ b/java/com/google/gerrit/server/ChangeUtil.java @@ -40,7 +40,7 @@ public class ChangeUtil { private static final BaseEncoding UUID_ENCODING = BaseEncoding.base16().lowerCase(); public static final Ordering PS_ID_ORDER = - Ordering.from(comparingInt(PatchSet::getPatchSetId)); + Ordering.from(comparingInt(PatchSet::number)); /** @return a new unique identifier for change message entities. */ public static String messageUuid() { diff --git a/java/com/google/gerrit/server/CommentsUtil.java b/java/com/google/gerrit/server/CommentsUtil.java index ea65bd1496..449d61b73b 100644 --- a/java/com/google/gerrit/server/CommentsUtil.java +++ b/java/com/google/gerrit/server/CommentsUtil.java @@ -308,9 +308,9 @@ public class CommentsUtil { public static void setCommentCommitId(Comment c, PatchListCache cache, Change change, PatchSet ps) throws PatchListNotAvailableException { checkArgument( - c.key.patchSetId == ps.getId().get(), + c.key.patchSetId == ps.id().get(), "cannot set commit ID for patch set %s on comment %s", - ps.getId(), + ps.id(), c); if (c.getCommitId() == null) { if (Side.fromShort(c.side) == Side.PARENT) { @@ -320,7 +320,7 @@ public class CommentsUtil { c.setCommitId(cache.getOldId(change, ps, null)); } } else { - c.setCommitId(ps.getCommitId()); + c.setCommitId(ps.commitId()); } } } diff --git a/java/com/google/gerrit/server/PatchSetUtil.java b/java/com/google/gerrit/server/PatchSetUtil.java index 9c31f351da..6d1aa97d9b 100644 --- a/java/com/google/gerrit/server/PatchSetUtil.java +++ b/java/com/google/gerrit/server/PatchSetUtil.java @@ -166,7 +166,7 @@ public class PatchSetUtil { public RevCommit getRevCommit(Project.NameKey project, PatchSet patchSet) throws IOException { try (Repository repo = repoManager.openRepository(project); RevWalk rw = new RevWalk(repo)) { - RevCommit src = rw.parseCommit(patchSet.getCommitId()); + RevCommit src = rw.parseCommit(patchSet.commitId()); rw.parseBody(src); return src; } diff --git a/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java b/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java index 2df7ae6c5f..49f7dbe177 100644 --- a/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java +++ b/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java @@ -476,7 +476,7 @@ class RevisionApiImpl implements RevisionApi { // Reread change to pick up new notes refs. return changes .id(revision.getChange().getId().get()) - .revision(revision.getPatchSet().getId().get()) + .revision(revision.getPatchSet().id().get()) .draft(id); } catch (Exception e) { throw asRestApiException("Cannot create draft", e); @@ -587,7 +587,7 @@ class RevisionApiImpl implements RevisionApi { ListMultimapBuilder.treeKeys().arrayListValues().build(); try { Iterable approvals = - approvalsUtil.byPatchSet(revision.getNotes(), revision.getPatchSet().getId(), null, null); + approvalsUtil.byPatchSet(revision.getNotes(), revision.getPatchSet().id(), null, null); AccountLoader accountLoader = accountLoaderFactory.create( EnumSet.of( diff --git a/java/com/google/gerrit/server/change/ChangeInserter.java b/java/com/google/gerrit/server/change/ChangeInserter.java index 34bad7b730..a103bfc7fa 100644 --- a/java/com/google/gerrit/server/change/ChangeInserter.java +++ b/java/com/google/gerrit/server/change/ChangeInserter.java @@ -426,9 +426,9 @@ public class ChangeInserter implements InsertChangeOp { if (message != null) { changeMessage = ChangeMessagesUtil.newMessage( - patchSet.getId(), + patchSet.id(), ctx.getUser(), - patchSet.getCreatedOn(), + patchSet.createdOn(), message, ChangeMessagesUtil.uploadedPatchSetTag(workInProgress)); cmUtil.addChangeMessage(update, changeMessage); diff --git a/java/com/google/gerrit/server/change/ChangeJson.java b/java/com/google/gerrit/server/change/ChangeJson.java index 8b43c9ead3..95313a9d7b 100644 --- a/java/com/google/gerrit/server/change/ChangeJson.java +++ b/java/com/google/gerrit/server/change/ChangeJson.java @@ -286,7 +286,7 @@ public class ChangeJson { public ChangeInfo format(RevisionResource rsrc) { ChangeData cd = changeDataFactory.create(rsrc.getNotes()); - return format(cd, Optional.of(rsrc.getPatchSet().getId()), true, ChangeInfo::new); + return format(cd, Optional.of(rsrc.getPatchSet().id()), true, ChangeInfo::new); } public List> format(List> in) @@ -784,7 +784,7 @@ public class ChangeJson { } Map map = Maps.newHashMapWithExpectedSize(src.size()); for (PatchSet patchSet : src) { - map.put(patchSet.getId(), patchSet); + map.put(patchSet.id(), patchSet); } return map; } diff --git a/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java b/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java index 50104fdab5..45fc8b1c01 100644 --- a/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java +++ b/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java @@ -367,13 +367,13 @@ public class ChangeKindCacheImpl implements ChangeKindCache { ChangeKind kind = ChangeKind.REWORK; // Trivial case: if we're on the first patch, we don't need to use // the repository. - if (patch.getId().get() > 1) { + if (patch.id().get() > 1) { try { Collection patchSetCollection = change.patchSets(); PatchSet priorPs = patch; for (PatchSet ps : patchSetCollection) { - if (ps.getId().get() < patch.getId().get() - && (ps.getId().get() > priorPs.getId().get() || priorPs == patch)) { + if (ps.id().get() < patch.id().get() + && (ps.id().get() > priorPs.id().get() || priorPs == patch)) { // We only want the previous patch set, so walk until the last one priorPs = ps; } @@ -386,13 +386,13 @@ public class ChangeKindCacheImpl implements ChangeKindCache { if (priorPs != patch) { kind = cache.getChangeKind( - change.project(), rw, repoConfig, priorPs.getCommitId(), patch.getCommitId()); + change.project(), rw, repoConfig, priorPs.commitId(), patch.commitId()); } } catch (StorageException e) { // Do nothing; assume we have a complex change logger.atWarning().withCause(e).log( "Unable to get change kind for patchSet %s of change %s", - patch.getPatchSetId(), change.getId()); + patch.number(), change.getId()); } } return kind; @@ -408,7 +408,7 @@ public class ChangeKindCacheImpl implements ChangeKindCache { ChangeKind kind = ChangeKind.REWORK; // Trivial case: if we're on the first patch, we don't need to open // the repository. - if (patch.getId().get() > 1) { + if (patch.id().get() > 1) { try (Repository repo = repoManager.openRepository(change.getProject()); RevWalk rw = new RevWalk(repo)) { kind = @@ -418,7 +418,7 @@ public class ChangeKindCacheImpl implements ChangeKindCache { // Do nothing; assume we have a complex change logger.atWarning().withCause(e).log( "Unable to get change kind for patchSet %s of change %s", - patch.getPatchSetId(), change.getChangeId()); + patch.number(), change.getChangeId()); } } return kind; diff --git a/java/com/google/gerrit/server/change/ChangeResource.java b/java/com/google/gerrit/server/change/ChangeResource.java index 98b728f167..19a4e5ce80 100644 --- a/java/com/google/gerrit/server/change/ChangeResource.java +++ b/java/com/google/gerrit/server/change/ChangeResource.java @@ -149,7 +149,7 @@ public class ChangeResource implements RestResource, HasETag { accounts.add(getChange().getAssignee()); } try { - patchSetUtil.byChange(notes).stream().map(PatchSet::getUploader).forEach(accounts::add); + patchSetUtil.byChange(notes).stream().map(PatchSet::uploader).forEach(accounts::add); // It's intentional to include the states for *all* reviewers into the ETag computation. // We need the states of all current reviewers and CCs because they are part of ChangeInfo. diff --git a/java/com/google/gerrit/server/change/ConsistencyChecker.java b/java/com/google/gerrit/server/change/ConsistencyChecker.java index c00cb2b11f..0e555e9dc4 100644 --- a/java/com/google/gerrit/server/change/ConsistencyChecker.java +++ b/java/com/google/gerrit/server/change/ConsistencyChecker.java @@ -265,7 +265,7 @@ public class ConsistencyChecker { try { refs = repo.getRefDatabase() - .exactRef(all.stream().map(ps -> ps.getId().toRefName()).toArray(String[]::new)); + .exactRef(all.stream().map(ps -> ps.id().toRefName()).toArray(String[]::new)); } catch (IOException e) { error("error reading refs", e); refs = Collections.emptyMap(); @@ -274,9 +274,9 @@ public class ConsistencyChecker { List deletePatchSetOps = new ArrayList<>(); for (PatchSet ps : all) { // Check revision format. - int psNum = ps.getId().get(); - String refName = ps.getId().toRefName(); - ObjectId objId = ps.getCommitId(); + int psNum = ps.id().get(); + String refName = ps.id().toRefName(); + ObjectId objId = ps.commitId(); patchSetsBySha.put(objId, ps); // Check ref existence. @@ -296,13 +296,13 @@ public class ConsistencyChecker { RevCommit psCommit = parseCommit(objId, String.format("patch set %d", psNum)); if (psCommit == null) { if (fix != null && fix.deletePatchSetIfCommitMissing) { - deletePatchSetOps.add(new DeletePatchSetFromDbOp(lastProblem(), ps.getId())); + deletePatchSetOps.add(new DeletePatchSetFromDbOp(lastProblem(), ps.id())); } continue; } else if (refProblem != null && fix != null) { fixPatchSetRef(refProblem, ps); } - if (ps.getId().equals(change().currentPatchSetId())) { + if (ps.id().equals(change().currentPatchSetId())) { currPsCommit = psCommit; } } @@ -316,7 +316,7 @@ public class ConsistencyChecker { problem( String.format( "Multiple patch sets pointing to %s: %s", - e.getKey().name(), Collections2.transform(e.getValue(), PatchSet::getPatchSetId))); + e.getKey().name(), Collections2.transform(e.getValue(), PatchSet::number))); } } @@ -348,10 +348,10 @@ public class ConsistencyChecker { try { merged = rw.isMergedInto(currPsCommit, tip); } catch (IOException e) { - problem("Error checking whether patch set " + currPs.getId().get() + " is merged"); + problem("Error checking whether patch set " + currPs.id().get() + " is merged"); return; } - checkMergedBitMatchesStatus(currPs.getId(), currPsCommit, merged); + checkMergedBitMatchesStatus(currPs.id(), currPsCommit, merged); } } @@ -376,7 +376,7 @@ public class ConsistencyChecker { formatProblemMessage( "Patch set %d (%s) is not merged into" + " destination ref %s (%s), but change status is %s", - currPs.getId().get(), commit.name(), refName, tip.name())); + currPs.id().get(), commit.name(), refName, tip.name())); } } @@ -601,9 +601,9 @@ public class ConsistencyChecker { private void fixPatchSetRef(ProblemInfo p, PatchSet ps) { try { - RefUpdate ru = repo.updateRef(ps.getId().toRefName()); + RefUpdate ru = repo.updateRef(ps.id().toRefName()); ru.setForceUpdate(true); - ru.setNewObjectId(ps.getCommitId()); + ru.setNewObjectId(ps.commitId()); ru.setRefLogIdent(newRefLogIdent()); ru.setRefLogMessage("Repair patch set ref", true); RefUpdate.Result result = ru.update(); @@ -630,7 +630,7 @@ public class ConsistencyChecker { } } catch (IOException e) { String msg = "Error fixing patch set ref"; - logger.atWarning().withCause(e).log("%s %s", msg, ps.getId().toRefName()); + logger.atWarning().withCause(e).log("%s %s", msg, ps.id().toRefName()); p.status = Status.FIX_FAILED; p.outcome = msg; } @@ -714,8 +714,8 @@ public class ConsistencyChecker { // and whether they are seen by this op; we are already given the full set // of patch sets that will eventually be deleted in this update. for (PatchSet ps : psUtil.byChange(ctx.getNotes())) { - if (!toDelete.contains(ps.getId())) { - all.add(ps.getId()); + if (!toDelete.contains(ps.id())) { + all.add(ps.id()); } } if (all.isEmpty()) { diff --git a/java/com/google/gerrit/server/change/DeleteChangeOp.java b/java/com/google/gerrit/server/change/DeleteChangeOp.java index 6319a08e43..a56404de2f 100644 --- a/java/com/google/gerrit/server/change/DeleteChangeOp.java +++ b/java/com/google/gerrit/server/change/DeleteChangeOp.java @@ -86,8 +86,7 @@ public class DeleteChangeOp implements BatchUpdateOp { if (isPatchSetMerged(ctx, patchSet)) { throw new ResourceConflictException( String.format( - "Cannot delete change %s: patch set %s is already merged", - id, patchSet.getPatchSetId())); + "Cannot delete change %s: patch set %s is already merged", id, patchSet.number())); } } } @@ -100,12 +99,12 @@ public class DeleteChangeOp implements BatchUpdateOp { RevWalk revWalk = ctx.getRevWalk(); return revWalk.isMergedInto( - revWalk.parseCommit(patchSet.getCommitId()), revWalk.parseCommit(destId.get())); + revWalk.parseCommit(patchSet.commitId()), revWalk.parseCommit(destId.get())); } private void cleanUpReferences(Change.Id id, Collection patchSets) throws IOException { for (PatchSet ps : patchSets) { - accountPatchReviewStore.run(s -> s.clearReviewed(ps.getId())); + accountPatchReviewStore.run(s -> s.clearReviewed(ps.id())); } // Non-atomic operation on All-Users refs; not much we can do to make it atomic. diff --git a/java/com/google/gerrit/server/change/DeleteReviewerOp.java b/java/com/google/gerrit/server/change/DeleteReviewerOp.java index 29458a864b..e0b4d2c016 100644 --- a/java/com/google/gerrit/server/change/DeleteReviewerOp.java +++ b/java/com/google/gerrit/server/change/DeleteReviewerOp.java @@ -134,7 +134,7 @@ public class DeleteReviewerOp implements BatchUpdateOp { // Check if removing this vote is OK removeReviewerControl.checkRemoveReviewer(ctx.getNotes(), ctx.getUser(), a); del.add(a); - if (a.getPatchSetId().equals(currPs.getId()) && a.getValue() != 0) { + if (a.getPatchSetId().equals(currPs.id()) && a.getValue() != 0) { oldApprovals.put(a.getLabel(), a.getValue()); removedVotesMsg .append("* ") @@ -152,7 +152,7 @@ public class DeleteReviewerOp implements BatchUpdateOp { } else { msg.append("."); } - ChangeUpdate update = ctx.getUpdate(currPs.getId()); + ChangeUpdate update = ctx.getUpdate(currPs.id()); update.removeReviewer(reviewerId); changeMessage = diff --git a/java/com/google/gerrit/server/change/EmailReviewComments.java b/java/com/google/gerrit/server/change/EmailReviewComments.java index 8353501f93..c6bcd81aee 100644 --- a/java/com/google/gerrit/server/change/EmailReviewComments.java +++ b/java/com/google/gerrit/server/change/EmailReviewComments.java @@ -129,7 +129,7 @@ public class EmailReviewComments implements Runnable, RequestContext { cm.setNotify(notify); cm.send(); } catch (Exception e) { - logger.atSevere().withCause(e).log("Cannot email comments for %s", patchSet.getId()); + logger.atSevere().withCause(e).log("Cannot email comments for %s", patchSet.id()); } finally { requestContext.setContext(old); } diff --git a/java/com/google/gerrit/server/change/FileInfoJson.java b/java/com/google/gerrit/server/change/FileInfoJson.java index 1416358b66..8e7f8eaa59 100644 --- a/java/com/google/gerrit/server/change/FileInfoJson.java +++ b/java/com/google/gerrit/server/change/FileInfoJson.java @@ -43,13 +43,13 @@ public class FileInfoJson { public Map toFileInfoMap(Change change, PatchSet patchSet) throws PatchListNotAvailableException { - return toFileInfoMap(change, patchSet.getCommitId(), null); + return toFileInfoMap(change, patchSet.commitId(), null); } public Map toFileInfoMap( Change change, ObjectId objectId, @Nullable PatchSet base) throws PatchListNotAvailableException { - ObjectId a = base != null ? base.getCommitId() : null; + ObjectId a = base != null ? base.commitId() : null; return toFileInfoMap(change, PatchListKey.againstCommit(a, objectId, Whitespace.IGNORE_NONE)); } diff --git a/java/com/google/gerrit/server/change/FileResource.java b/java/com/google/gerrit/server/change/FileResource.java index 68436435ff..ba724ec66c 100644 --- a/java/com/google/gerrit/server/change/FileResource.java +++ b/java/com/google/gerrit/server/change/FileResource.java @@ -29,7 +29,7 @@ public class FileResource implements RestResource { public FileResource(RevisionResource rev, String name) { this.rev = rev; - this.key = Patch.key(rev.getPatchSet().getId(), name); + this.key = Patch.key(rev.getPatchSet().id(), name); } public Patch.Key getPatchKey() { diff --git a/java/com/google/gerrit/server/change/PatchSetInserter.java b/java/com/google/gerrit/server/change/PatchSetInserter.java index 11dc4e3aa6..fecc0993e4 100644 --- a/java/com/google/gerrit/server/change/PatchSetInserter.java +++ b/java/com/google/gerrit/server/change/PatchSetInserter.java @@ -208,7 +208,7 @@ public class PatchSetInserter implements BatchUpdateOp { if (newGroups.isEmpty()) { PatchSet prevPs = psUtil.current(ctx.getNotes()); if (prevPs != null) { - newGroups = prevPs.getGroups(); + newGroups = prevPs.groups(); } } patchSet = @@ -222,7 +222,7 @@ public class PatchSetInserter implements BatchUpdateOp { if (message != null) { changeMessage = ChangeMessagesUtil.newMessage( - patchSet.getId(), + patchSet.id(), ctx.getUser(), ctx.getWhen(), message, diff --git a/java/com/google/gerrit/server/change/PureRevert.java b/java/com/google/gerrit/server/change/PureRevert.java index 56ec64830d..63146fa18e 100644 --- a/java/com/google/gerrit/server/change/PureRevert.java +++ b/java/com/google/gerrit/server/change/PureRevert.java @@ -54,6 +54,6 @@ public class PureRevert { } return pureRevertCache.isPureRevert( - notes.getProjectName(), notes.getCurrentPatchSet().getCommitId(), claimedOriginalObjectId); + notes.getProjectName(), notes.getCurrentPatchSet().commitId(), claimedOriginalObjectId); } } diff --git a/java/com/google/gerrit/server/change/RebaseChangeOp.java b/java/com/google/gerrit/server/change/RebaseChangeOp.java index 7c51446385..688d349ab1 100644 --- a/java/com/google/gerrit/server/change/RebaseChangeOp.java +++ b/java/com/google/gerrit/server/change/RebaseChangeOp.java @@ -151,7 +151,7 @@ public class RebaseChangeOp implements BatchUpdateOp { // Ok that originalPatchSet was not read in a transaction, since we just // need its revision. RevWalk rw = ctx.getRevWalk(); - RevCommit original = rw.parseCommit(originalPatchSet.getCommitId()); + RevCommit original = rw.parseCommit(originalPatchSet.commitId()); rw.parseBody(original); RevCommit baseCommit = rw.parseCommit(baseCommitId); CurrentUser changeOwner = identifiedUserFactory.create(notes.getChange().getOwner()); @@ -161,7 +161,7 @@ public class RebaseChangeOp implements BatchUpdateOp { rw.parseBody(baseCommit); newCommitMessage = newMergeUtil() - .createCommitMessageOnSubmit(original, baseCommit, notes, originalPatchSet.getId()); + .createCommitMessageOnSubmit(original, baseCommit, notes, originalPatchSet.id()); } else { newCommitMessage = original.getFullMessage(); } @@ -175,7 +175,7 @@ public class RebaseChangeOp implements BatchUpdateOp { rebasedPatchSetId = ChangeUtil.nextPatchSetIdFromChangeRefs( - ctx.getRepoView().getRefs(originalPatchSet.getId().changeId().toRefPrefix()).keySet(), + ctx.getRepoView().getRefs(originalPatchSet.id().changeId().toRefPrefix()).keySet(), notes.getChange().currentPatchSetId()); patchSetInserter = patchSetInserterFactory @@ -190,14 +190,14 @@ public class RebaseChangeOp implements BatchUpdateOp { "Patch Set " + rebasedPatchSetId.get() + ": Patch Set " - + originalPatchSet.getId().get() + + originalPatchSet.id().get() + " was rebased"); } if (base != null && !base.notes().getChange().isMerged()) { if (!base.notes().getChange().isMerged()) { // Add to end of relation chain for open base change. - patchSetInserter.setGroups(base.patchSet().getGroups()); + patchSetInserter.setGroups(base.patchSet().groups()); } else { // If the base is merged, start a new relation chain. patchSetInserter.setGroups(GroupCollector.getDefaultGroups(rebasedCommit)); diff --git a/java/com/google/gerrit/server/change/RebaseUtil.java b/java/com/google/gerrit/server/change/RebaseUtil.java index 8e01b15f7f..731648c48e 100644 --- a/java/com/google/gerrit/server/change/RebaseUtil.java +++ b/java/com/google/gerrit/server/change/RebaseUtil.java @@ -64,7 +64,7 @@ public class RebaseUtil { return false; } catch (StorageException | IOException e) { logger.atWarning().withCause(e).log( - "Error checking if patch set %s on %s can be rebased", patchSet.getId(), dest); + "Error checking if patch set %s on %s can be rebased", patchSet.id(), dest); return false; } } @@ -108,10 +108,10 @@ public class RebaseUtil { Base ret = null; for (ChangeData cd : queryProvider.get().byProjectCommit(rsrc.getProject(), base)) { for (PatchSet ps : cd.patchSets()) { - if (!ObjectIds.matchesAbbreviation(ps.getCommitId(), base)) { + if (!ObjectIds.matchesAbbreviation(ps.commitId(), base)) { continue; } - if (ret == null || ret.patchSet().getId().get() < ps.getId().get()) { + if (ret == null || ret.patchSet().id().get() < ps.id().get()) { ret = Base.create(cd.notes(), ps); } } @@ -144,7 +144,7 @@ public class RebaseUtil { PatchSet patchSet, BranchNameKey destBranch, Repository git, RevWalk rw) throws RestApiException, IOException { ObjectId baseId = null; - RevCommit commit = rw.parseCommit(patchSet.getCommitId()); + RevCommit commit = rw.parseCommit(patchSet.commitId()); if (commit.getParentCount() > 1) { throw new UnprocessableEntityException("Cannot rebase a change with multiple parents."); @@ -158,7 +158,7 @@ public class RebaseUtil { CHANGES: for (ChangeData cd : queryProvider.get().byBranchCommit(destBranch, parentId.name())) { for (PatchSet depPatchSet : cd.patchSets()) { - if (!depPatchSet.getCommitId().equals(parentId)) { + if (!depPatchSet.commitId().equals(parentId)) { continue; } Change depChange = cd.change(); @@ -168,11 +168,11 @@ public class RebaseUtil { } if (depChange.isNew()) { - if (depPatchSet.getId().equals(depChange.currentPatchSetId())) { + if (depPatchSet.id().equals(depChange.currentPatchSetId())) { throw new ResourceConflictException( "Change is already based on the latest patch set of the dependent change."); } - baseId = cd.currentPatchSet().getCommitId(); + baseId = cd.currentPatchSet().commitId(); } break CHANGES; } diff --git a/java/com/google/gerrit/server/change/RevisionJson.java b/java/com/google/gerrit/server/change/RevisionJson.java index d629077fd2..b66ea4af53 100644 --- a/java/com/google/gerrit/server/change/RevisionJson.java +++ b/java/com/google/gerrit/server/change/RevisionJson.java @@ -216,7 +216,7 @@ public class RevisionJson { try (Repository repo = openRepoIfNecessary(cd.project()); RevWalk rw = newRevWalk(repo)) { for (PatchSet in : map.values()) { - PatchSet.Id id = in.getId(); + PatchSet.Id id = in.id(); boolean want; if (has(ALL_REVISIONS)) { want = true; @@ -227,7 +227,7 @@ public class RevisionJson { } if (want) { res.put( - in.getCommitId().name(), + in.commitId().name(), toRevisionInfo(accountLoader, cd, in, repo, rw, false, changeInfo)); } } @@ -251,7 +251,7 @@ public class RevisionJson { String projectName = cd.project().get(); String url = scheme.getUrl(projectName); - String refName = in.getRefName(); + String refName = in.refName(); FetchInfo fetchInfo = new FetchInfo(url, refName); r.put(schemeName, fetchInfo); @@ -275,14 +275,14 @@ public class RevisionJson { throws PatchListNotAvailableException, GpgException, IOException, PermissionBackendException { Change c = cd.change(); RevisionInfo out = new RevisionInfo(); - out.isCurrent = in.getId().equals(c.currentPatchSetId()); - out._number = in.getId().get(); - out.ref = in.getRefName(); - out.created = in.getCreatedOn(); - out.uploader = accountLoader.get(in.getUploader()); + out.isCurrent = in.id().equals(c.currentPatchSetId()); + out._number = in.id().get(); + out.ref = in.refName(); + out.created = in.createdOn(); + out.uploader = accountLoader.get(in.uploader()); out.fetch = makeFetchMap(cd, in); out.kind = changeKindCache.getChangeKind(rw, repo != null ? repo.getConfig() : null, cd, in); - out.description = in.getDescription().orElse(null); + out.description = in.description().orElse(null); boolean setCommit = has(ALL_COMMITS) || (out.isCurrent && has(CURRENT_COMMIT)); boolean addFooters = out.isCurrent && has(COMMIT_FOOTERS); @@ -290,7 +290,7 @@ public class RevisionJson { checkState(rw != null); checkState(repo != null); Project.NameKey project = c.getProject(); - String rev = in.getCommitId().name(); + String rev = in.commitId().name(); RevCommit commit = rw.parseCommit(ObjectId.fromString(rev)); rw.parseBody(commit); if (setCommit) { @@ -306,7 +306,7 @@ public class RevisionJson { out.commitWithFooters = mergeUtilFactory .create(projectCache.get(project)) - .createCommitMessageOnSubmit(commit, mergeTip, cd.notes(), in.getId()); + .createCommitMessageOnSubmit(commit, mergeTip, cd.notes(), in.id()); } } @@ -324,10 +324,10 @@ public class RevisionJson { } if (gpgApi.isEnabled() && has(PUSH_CERTIFICATES)) { - if (in.getPushCertificate().isPresent()) { + if (in.pushCertificate().isPresent()) { out.pushCertificate = gpgApi.checkPushCertificate( - in.getPushCertificate().get(), userFactory.create(in.getUploader())); + in.pushCertificate().get(), userFactory.create(in.uploader())); } else { out.pushCertificate = new PushCertificateInfo(); } diff --git a/java/com/google/gerrit/server/change/RevisionResource.java b/java/com/google/gerrit/server/change/RevisionResource.java index caafe24a57..efd9d2d443 100644 --- a/java/com/google/gerrit/server/change/RevisionResource.java +++ b/java/com/google/gerrit/server/change/RevisionResource.java @@ -114,7 +114,7 @@ public class RevisionResource implements RestResource, HasETag { @Override public String toString() { - String s = ps.getId().toString(); + String s = ps.id().toString(); if (edit.isPresent()) { s = "edit:" + s; } @@ -122,6 +122,6 @@ public class RevisionResource implements RestResource, HasETag { } public boolean isCurrent() { - return ps.getId().equals(getChange().currentPatchSetId()); + return ps.id().equals(getChange().currentPatchSetId()); } } diff --git a/java/com/google/gerrit/server/change/WalkSorter.java b/java/com/google/gerrit/server/change/WalkSorter.java index dc8e3b5b1e..056312cfde 100644 --- a/java/com/google/gerrit/server/change/WalkSorter.java +++ b/java/com/google/gerrit/server/change/WalkSorter.java @@ -222,7 +222,7 @@ public class WalkSorter { for (ChangeData cd : in) { PatchSet maxPs = null; for (PatchSet ps : cd.patchSets()) { - if (shouldInclude(ps) && (maxPs == null || ps.getId().get() > maxPs.getId().get())) { + if (shouldInclude(ps) && (maxPs == null || ps.id().get() > maxPs.id().get())) { maxPs = ps; } } @@ -230,18 +230,18 @@ public class WalkSorter { continue; // No patch sets matched. } try { - RevCommit c = rw.parseCommit(maxPs.getCommitId()); + RevCommit c = rw.parseCommit(maxPs.commitId()); byCommit.put(c, PatchSetData.create(cd, maxPs, c)); } catch (MissingObjectException | IncorrectObjectTypeException e) { logger.atWarning().withCause(e).log( - "missing commit %s for patch set %s", maxPs.getCommitId().name(), maxPs.getId()); + "missing commit %s for patch set %s", maxPs.commitId().name(), maxPs.id()); } } return byCommit; } private boolean shouldInclude(PatchSet ps) { - return includePatchSets.isEmpty() || includePatchSets.contains(ps.getId()); + return includePatchSets.isEmpty() || includePatchSets.contains(ps.id()); } private static void markStart(RevWalk rw, Iterable commits) throws IOException { diff --git a/java/com/google/gerrit/server/edit/ChangeEditJson.java b/java/com/google/gerrit/server/edit/ChangeEditJson.java index f297e5e80d..25dcae06a9 100644 --- a/java/com/google/gerrit/server/edit/ChangeEditJson.java +++ b/java/com/google/gerrit/server/edit/ChangeEditJson.java @@ -51,8 +51,8 @@ public class ChangeEditJson { public EditInfo toEditInfo(ChangeEdit edit, boolean downloadCommands) { EditInfo out = new EditInfo(); out.commit = fillCommit(edit.getEditCommit()); - out.baseRevision = edit.getBasePatchSet().getCommitId().name(); - out.basePatchSetNumber = edit.getBasePatchSet().getPatchSetId(); + out.baseRevision = edit.getBasePatchSet().commitId().name(); + out.basePatchSetNumber = edit.getBasePatchSet().number(); out.ref = edit.getRefName(); if (downloadCommands) { out.fetch = fillFetchMap(edit); diff --git a/java/com/google/gerrit/server/edit/ChangeEditModifier.java b/java/com/google/gerrit/server/edit/ChangeEditModifier.java index 2815674d53..fcd38c3435 100644 --- a/java/com/google/gerrit/server/edit/ChangeEditModifier.java +++ b/java/com/google/gerrit/server/edit/ChangeEditModifier.java @@ -124,7 +124,7 @@ public class ChangeEditModifier { } PatchSet currentPatchSet = lookupCurrentPatchSet(notes); - ObjectId patchSetCommitId = currentPatchSet.getCommitId(); + ObjectId patchSetCommitId = currentPatchSet.commitId(); createEdit(repository, notes, currentPatchSet, patchSetCommitId, TimeUtil.nowTs()); } @@ -157,7 +157,7 @@ public class ChangeEditModifier { throw new InvalidChangeOperationException( String.format( "Change edit for change %s is already based on latest patch set %s", - notes.getChangeId(), currentPatchSet.getId())); + notes.getChangeId(), currentPatchSet.id())); } rebase(repository, changeEdit, currentPatchSet); @@ -421,10 +421,10 @@ public class ChangeEditModifier { String.format( "Only the patch set %s on which the existing change edit is based may be modified " + "(specified patch set: %s)", - changeEdit.getBasePatchSet().getId(), patchSet.getId())); + changeEdit.getBasePatchSet().id(), patchSet.id())); } } else { - PatchSet.Id patchSetId = patchSet.getId(); + PatchSet.Id patchSetId = patchSet.id(); PatchSet.Id currentPatchSetId = notes.getChange().currentPatchSetId(); if (!patchSetId.equals(currentPatchSetId)) { throw new InvalidChangeOperationException( @@ -451,12 +451,12 @@ public class ChangeEditModifier { private static boolean isBasedOn(ChangeEdit changeEdit, PatchSet patchSet) { PatchSet editBasePatchSet = changeEdit.getBasePatchSet(); - return editBasePatchSet.getId().equals(patchSet.getId()); + return editBasePatchSet.id().equals(patchSet.id()); } private static RevCommit lookupCommit(Repository repository, PatchSet patchSet) throws IOException { - ObjectId patchSetCommitId = patchSet.getCommitId(); + ObjectId patchSetCommitId = patchSet.commitId(); return lookupCommit(repository, patchSetCommitId); } @@ -483,7 +483,7 @@ public class ChangeEditModifier { private static ObjectId merge(Repository repository, ChangeEdit changeEdit, ObjectId newTreeId) throws IOException, MergeConflictException { PatchSet basePatchSet = changeEdit.getBasePatchSet(); - ObjectId basePatchSetCommitId = basePatchSet.getCommitId(); + ObjectId basePatchSetCommitId = basePatchSet.commitId(); ObjectId editCommitId = changeEdit.getEditCommit(); ThreeWayMerger threeWayMerger = MergeStrategy.RESOLVE.newMerger(repository, true); @@ -540,7 +540,7 @@ public class ChangeEditModifier { private String getEditRefName(Change change, PatchSet basePatchSet) { IdentifiedUser me = currentUser.get().asIdentifiedUser(); - return RefNames.refsEdit(me.getAccountId(), change.getId(), basePatchSet.getId()); + return RefNames.refsEdit(me.getAccountId(), change.getId(), basePatchSet.id()); } private ChangeEdit updateEdit( diff --git a/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/java/com/google/gerrit/server/edit/ChangeEditUtil.java index e50779e021..1af81482d4 100644 --- a/java/com/google/gerrit/server/edit/ChangeEditUtil.java +++ b/java/com/google/gerrit/server/edit/ChangeEditUtil.java @@ -162,7 +162,7 @@ public class ChangeEditUtil { ObjectReader reader = oi.newReader(); RevWalk rw = new RevWalk(reader)) { PatchSet basePatchSet = edit.getBasePatchSet(); - if (!basePatchSet.getId().equals(change.currentPatchSetId())) { + if (!basePatchSet.id().equals(change.currentPatchSetId())) { throw new ResourceConflictException("only edit for current patch set can be published"); } @@ -174,17 +174,14 @@ public class ChangeEditUtil { new StringBuilder("Patch Set ").append(inserter.getPatchSetId().get()).append(": "); // Previously checked that the base patch set is the current patch set. - ObjectId prior = basePatchSet.getCommitId(); + ObjectId prior = basePatchSet.commitId(); ChangeKind kind = changeKindCache.getChangeKind(change.getProject(), rw, repo.getConfig(), prior, squashed); if (kind == ChangeKind.NO_CODE_CHANGE) { message.append("Commit message was updated."); inserter.setDescription("Edit commit message"); } else { - message - .append("Published edit on patch set ") - .append(basePatchSet.getPatchSetId()) - .append("."); + message.append("Published edit on patch set ").append(basePatchSet.number()).append("."); } try (BatchUpdate bu = updateFactory.create(change.getProject(), user, TimeUtil.nowTs())) { @@ -232,7 +229,7 @@ public class ChangeEditUtil { private RevCommit squashEdit( RevWalk rw, ObjectInserter inserter, RevCommit edit, PatchSet basePatchSet) throws IOException, ResourceConflictException { - RevCommit parent = rw.parseCommit(basePatchSet.getCommitId()); + RevCommit parent = rw.parseCommit(basePatchSet.commitId()); if (parent.getTree().equals(edit.getTree()) && edit.getFullMessage().equals(parent.getFullMessage())) { throw new ResourceConflictException("identical tree and message"); diff --git a/java/com/google/gerrit/server/events/EventFactory.java b/java/com/google/gerrit/server/events/EventFactory.java index 1385db5ee4..47bd226d9b 100644 --- a/java/com/google/gerrit/server/events/EventFactory.java +++ b/java/com/google/gerrit/server/events/EventFactory.java @@ -285,7 +285,7 @@ public class EventFactory { private void addDependsOn(RevWalk rw, ChangeAttribute ca, Change change, PatchSet currentPs) throws IOException { - RevCommit commit = rw.parseCommit(currentPs.getCommitId()); + RevCommit commit = rw.parseCommit(currentPs.commitId()); final List parentNames = new ArrayList<>(commit.getParentCount()); for (RevCommit p : commit.getParents()) { parentNames.add(p.name()); @@ -296,7 +296,7 @@ public class EventFactory { for (ChangeData cd : queryProvider.get().byProjectCommits(change.getProject(), parentNames)) { for (PatchSet ps : cd.patchSets()) { for (String p : parentNames) { - if (!ps.getCommitId().name().equals(p)) { + if (!ps.commitId().name().equals(p)) { continue; } ca.dependsOn.add(newDependsOn(requireNonNull(cd.change()), ps)); @@ -318,18 +318,18 @@ public class EventFactory { private void addNeededBy(RevWalk rw, ChangeAttribute ca, Change change, PatchSet currentPs) throws IOException { - if (currentPs.getGroups().isEmpty()) { + if (currentPs.groups().isEmpty()) { return; } - String rev = currentPs.getCommitId().name(); + String rev = currentPs.commitId().name(); // Find changes in the same related group as this patch set, having a patch // set whose parent matches this patch set's revision. for (ChangeData cd : InternalChangeQuery.byProjectGroups( - queryProvider, indexConfig, change.getProject(), currentPs.getGroups())) { + queryProvider, indexConfig, change.getProject(), currentPs.groups())) { PATCH_SETS: for (PatchSet ps : cd.patchSets()) { - RevCommit commit = rw.parseCommit(ps.getCommitId()); + RevCommit commit = rw.parseCommit(ps.commitId()); for (RevCommit p : commit.getParents()) { if (!p.name().equals(rev)) { continue; @@ -343,7 +343,7 @@ public class EventFactory { private DependencyAttribute newDependsOn(Change c, PatchSet ps) { DependencyAttribute d = newDependencyAttribute(c, ps); - d.isCurrentPatchSet = ps.getId().equals(c.currentPatchSetId()); + d.isCurrentPatchSet = ps.id().equals(c.currentPatchSetId()); return d; } @@ -355,8 +355,8 @@ public class EventFactory { DependencyAttribute d = new DependencyAttribute(); d.number = c.getId().get(); d.id = c.getKey().toString(); - d.revision = ps.getCommitId().name(); - d.ref = ps.getRefName(); + d.revision = ps.commitId().name(); + d.ref = ps.refName(); return d; } @@ -400,7 +400,7 @@ public class EventFactory { for (PatchSet p : ps) { PatchSetAttribute psa = asPatchSetAttribute(revWalk, change, p); if (approvals != null) { - addApprovals(psa, p.getId(), approvals, labelTypes); + addApprovals(psa, p.id(), approvals, labelTypes); } ca.patchSets.add(psa); if (includeFiles) { @@ -463,12 +463,12 @@ public class EventFactory { */ public PatchSetAttribute asPatchSetAttribute(RevWalk revWalk, Change change, PatchSet patchSet) { PatchSetAttribute p = new PatchSetAttribute(); - p.revision = patchSet.getCommitId().name(); - p.number = patchSet.getPatchSetId(); - p.ref = patchSet.getRefName(); - p.uploader = asAccountAttribute(patchSet.getUploader()); - p.createdOn = patchSet.getCreatedOn().getTime() / 1000L; - PatchSet.Id pId = patchSet.getId(); + p.revision = patchSet.commitId().name(); + p.number = patchSet.number(); + p.ref = patchSet.refName(); + p.uploader = asAccountAttribute(patchSet.uploader()); + p.createdOn = patchSet.createdOn().getTime() / 1000L; + PatchSet.Id pId = patchSet.id(); try { p.parents = new ArrayList<>(); RevCommit c = revWalk.parseCommit(ObjectId.fromString(p.revision)); @@ -495,7 +495,7 @@ public class EventFactory { } p.kind = changeKindCache.getChangeKind(change, patchSet); } catch (IOException | StorageException e) { - logger.atSevere().withCause(e).log("Cannot load patch set data for %s", patchSet.getId()); + logger.atSevere().withCause(e).log("Cannot load patch set data for %s", patchSet.id()); } catch (PatchListObjectTooLargeException e) { logger.atWarning().log("Cannot get size information for %s: %s", pId, e.getMessage()); } catch (PatchListNotAvailableException e) { diff --git a/java/com/google/gerrit/server/extensions/events/EventUtil.java b/java/com/google/gerrit/server/extensions/events/EventUtil.java index 2e09c7bba2..7122a4c10e 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().changeId()); + ChangeData cd = changeDataFactory.create(project, ps.id().changeId()); return revisionJsonFactory.create(CHANGE_OPTIONS).getRevisionInfo(cd, ps); } diff --git a/java/com/google/gerrit/server/git/GroupCollector.java b/java/com/google/gerrit/server/git/GroupCollector.java index 3f45fba7e1..c7dcc73754 100644 --- a/java/com/google/gerrit/server/git/GroupCollector.java +++ b/java/com/google/gerrit/server/git/GroupCollector.java @@ -82,9 +82,9 @@ public class GroupCollector { if (rsrc.getEdit().isPresent()) { // Groups for an edit are just the base revision's groups, since they have // the same parent. - return rsrc.getEdit().get().getBasePatchSet().getGroups(); + return rsrc.getEdit().get().getBasePatchSet().groups(); } - return rsrc.getPatchSet().getGroups(); + return rsrc.getPatchSet().groups(); } private interface Lookup { @@ -109,7 +109,7 @@ public class GroupCollector { // TODO(dborowitz): Reuse open repository from caller. ChangeNotes notes = notesFactory.createChecked(project, psId.changeId()); PatchSet ps = psUtil.get(notes, psId); - return ps != null ? ps.getGroups() : null; + return ps != null ? ps.groups() : null; }); } diff --git a/java/com/google/gerrit/server/git/MergedByPushOp.java b/java/com/google/gerrit/server/git/MergedByPushOp.java index 1f896e2abd..ca2c6def94 100644 --- a/java/com/google/gerrit/server/git/MergedByPushOp.java +++ b/java/com/google/gerrit/server/git/MergedByPushOp.java @@ -188,12 +188,12 @@ public class MergedByPushOp implements BatchUpdateOp { })); changeMerged.fire( - change, patchSet, ctx.getAccount(), patchSet.getCommitId().name(), ctx.getWhen()); + change, patchSet, ctx.getAccount(), patchSet.commitId().name(), ctx.getWhen()); } private PatchSetInfo getPatchSetInfo(ChangeContext ctx) throws IOException { RevWalk rw = ctx.getRevWalk(); - RevCommit commit = rw.parseCommit(requireNonNull(patchSet).getCommitId()); + RevCommit commit = rw.parseCommit(requireNonNull(patchSet).commitId()); return patchSetInfoFactory.get(rw, commit, psId); } } diff --git a/java/com/google/gerrit/server/git/PureRevertCache.java b/java/com/google/gerrit/server/git/PureRevertCache.java index c3e9423dc6..2faa0bb5ad 100644 --- a/java/com/google/gerrit/server/git/PureRevertCache.java +++ b/java/com/google/gerrit/server/git/PureRevertCache.java @@ -97,8 +97,8 @@ public class PureRevertCache { claimedRevert.getProjectName(), claimedRevert.getChange().getRevertOf()); return isPureRevert( claimedRevert.getProjectName(), - claimedRevert.getCurrentPatchSet().getCommitId(), - claimedOriginal.getCurrentPatchSet().getCommitId()); + claimedRevert.getCurrentPatchSet().commitId(), + claimedOriginal.getCurrentPatchSet().commitId()); } /** diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index b9a26db47f..5904cd7927 100644 --- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java @@ -2187,7 +2187,7 @@ class ReceiveCommits { // Schedule as a replacement to this one matching change. // - ObjectId currentPs = changes.get(0).currentPatchSet().getCommitId(); + ObjectId currentPs = changes.get(0).currentPatchSet().commitId(); // If Commit is already current PatchSet of target Change. if (p.commit.equals(currentPs)) { if (pending.size() == 1) { @@ -2817,7 +2817,7 @@ class ReceiveCommits { } if (edit.isPresent()) { - if (edit.get().getBasePatchSet().getId().equals(psId)) { + if (edit.get().getBasePatchSet().id().equals(psId)) { // replace edit cmd = new ReceiveCommand(edit.get().getEditCommit(), newCommitId, edit.get().getRefName()); @@ -2911,7 +2911,7 @@ class ReceiveCommits { @Override public boolean updateChange(ChangeContext ctx) { PatchSet ps = psUtil.get(ctx.getNotes(), psId); - List oldGroups = ps.getGroups(); + List oldGroups = ps.groups(); if (oldGroups == null) { if (groups == null) { return false; diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommitsAdvertiseRefsHook.java b/java/com/google/gerrit/server/git/receive/ReceiveCommitsAdvertiseRefsHook.java index 5e72ba4be9..f7e0078610 100644 --- a/java/com/google/gerrit/server/git/receive/ReceiveCommitsAdvertiseRefsHook.java +++ b/java/com/google/gerrit/server/git/receive/ReceiveCommitsAdvertiseRefsHook.java @@ -111,8 +111,8 @@ public class ReceiveCommitsAdvertiseRefsHook implements AdvertiseRefsHook { // Ensure we actually observed a patch set ref pointing to this // object, in case the database is out of sync with the repo and the // object doesn't actually exist. - if (allPatchSets.contains(ps.getCommitId())) { - r.add(ps.getCommitId()); + if (allPatchSets.contains(ps.commitId())) { + r.add(ps.commitId()); } } } diff --git a/java/com/google/gerrit/server/git/receive/ReplaceOp.java b/java/com/google/gerrit/server/git/receive/ReplaceOp.java index 396a35023e..1de5a3d6bd 100644 --- a/java/com/google/gerrit/server/git/receive/ReplaceOp.java +++ b/java/com/google/gerrit/server/git/receive/ReplaceOp.java @@ -250,7 +250,7 @@ public class ReplaceOp implements BatchUpdateOp { } if (groups.isEmpty()) { PatchSet prevPs = psUtil.current(notes); - groups = prevPs != null ? prevPs.getGroups() : ImmutableList.of(); + groups = prevPs != null ? prevPs.groups() : ImmutableList.of(); } ChangeData cd = changeDataFactory.create(ctx.getNotes()); @@ -562,7 +562,7 @@ public class ReplaceOp implements BatchUpdateOp { cm.send(); } catch (Exception e) { logger.atSevere().withCause(e).log( - "Cannot send email for new patch set %s", newPatchSet.getId()); + "Cannot send email for new patch set %s", newPatchSet.id()); } } diff --git a/java/com/google/gerrit/server/index/change/ChangeField.java b/java/com/google/gerrit/server/index/change/ChangeField.java index f47f8bc477..7fb8d2f700 100644 --- a/java/com/google/gerrit/server/index/change/ChangeField.java +++ b/java/com/google/gerrit/server/index/change/ChangeField.java @@ -451,7 +451,7 @@ public class ChangeField { exact(ChangeQueryBuilder.FIELD_EXACTCOMMIT).buildRepeatable(ChangeField::getRevisions); private static ImmutableSet getRevisions(ChangeData cd) { - return cd.patchSets().stream().map(ps -> ps.getCommitId().name()).collect(toImmutableSet()); + return cd.patchSets().stream().map(ps -> ps.commitId().name()).collect(toImmutableSet()); } /** Tracking id extracted from a footer. */ @@ -663,8 +663,7 @@ public class ChangeField { public static final FieldDef> GROUP = exact(ChangeQueryBuilder.FIELD_GROUP) .buildRepeatable( - cd -> - cd.patchSets().stream().flatMap(ps -> ps.getGroups().stream()).collect(toSet())); + cd -> cd.patchSets().stream().flatMap(ps -> ps.groups().stream()).collect(toSet())); /** Serialized patch set object, used for pre-populating results. */ public static final FieldDef> PATCH_SET = diff --git a/java/com/google/gerrit/server/mail/receive/MailProcessor.java b/java/com/google/gerrit/server/mail/receive/MailProcessor.java index 5a72b59d49..fec0a4159b 100644 --- a/java/com/google/gerrit/server/mail/receive/MailProcessor.java +++ b/java/com/google/gerrit/server/mail/receive/MailProcessor.java @@ -386,7 +386,7 @@ public class MailProcessor { commentsUtil.newComment( ctx, fileName, - patchSetForComment.getId(), + patchSetForComment.id(), (short) side.ordinal(), mailComment.getMessage(), false, diff --git a/java/com/google/gerrit/server/mail/send/ChangeEmail.java b/java/com/google/gerrit/server/mail/send/ChangeEmail.java index 170215e3eb..f28afbd0ac 100644 --- a/java/com/google/gerrit/server/mail/send/ChangeEmail.java +++ b/java/com/google/gerrit/server/mail/send/ChangeEmail.java @@ -156,10 +156,10 @@ public abstract class ChangeEmail extends NotificationEmail { } if (patchSet != null) { - setHeader(MailHeader.PATCH_SET.fieldName(), patchSet.getPatchSetId() + ""); + setHeader(MailHeader.PATCH_SET.fieldName(), patchSet.number() + ""); if (patchSetInfo == null) { try { - patchSetInfo = args.patchSetInfoFactory.get(changeData.notes(), patchSet.getId()); + patchSetInfo = args.patchSetInfoFactory.get(changeData.notes(), patchSet.id()); } catch (PatchSetInfoNotAvailableException | StorageException err) { patchSetInfo = null; } @@ -205,7 +205,7 @@ public abstract class ChangeEmail extends NotificationEmail { private void setCommitIdHeader() { if (patchSet != null) { - setHeader(MailHeader.COMMIT.fieldName(), patchSet.getCommitId().name()); + setHeader(MailHeader.COMMIT.fieldName(), patchSet.commitId().name()); } } @@ -286,7 +286,7 @@ public abstract class ChangeEmail extends NotificationEmail { /** Get the patch list corresponding to patch set patchSetId of this change. */ protected PatchList getPatchList(int patchSetId) throws PatchListNotAvailableException { PatchSet ps; - if (patchSetId == patchSet.getPatchSetId()) { + if (patchSetId == patchSet.number()) { ps = patchSet; } else { try { @@ -411,7 +411,7 @@ public abstract class ChangeEmail extends NotificationEmail { case ALL: default: if (patchSet != null) { - authors.add(patchSet.getUploader()); + authors.add(patchSet.uploader()); } if (patchSetInfo != null) { if (patchSetInfo.getAuthor().getAccount() != null) { @@ -461,8 +461,8 @@ public abstract class ChangeEmail extends NotificationEmail { soyContext.put("change", changeData); Map patchSetData = new HashMap<>(); - patchSetData.put("patchSetId", patchSet.getPatchSetId()); - patchSetData.put("refName", patchSet.getRefName()); + patchSetData.put("patchSetId", patchSet.number()); + patchSetData.put("refName", patchSet.refName()); soyContext.put("patchSet", patchSetData); Map patchSetInfoData = new HashMap<>(); @@ -472,7 +472,7 @@ public abstract class ChangeEmail extends NotificationEmail { footers.add(MailHeader.CHANGE_ID.withDelimiter() + change.getKey().get()); footers.add(MailHeader.CHANGE_NUMBER.withDelimiter() + Integer.toString(change.getChangeId())); - footers.add(MailHeader.PATCH_SET.withDelimiter() + patchSet.getPatchSetId()); + footers.add(MailHeader.PATCH_SET.withDelimiter() + patchSet.number()); footers.add(MailHeader.OWNER.withDelimiter() + getNameEmailFor(change.getOwner())); if (change.getAssignee() != null) { footers.add(MailHeader.ASSIGNEE.withDelimiter() + getNameEmailFor(change.getAssignee())); diff --git a/java/com/google/gerrit/server/mail/send/MergedSender.java b/java/com/google/gerrit/server/mail/send/MergedSender.java index cbc4117e26..f36ccb72f0 100644 --- a/java/com/google/gerrit/server/mail/send/MergedSender.java +++ b/java/com/google/gerrit/server/mail/send/MergedSender.java @@ -69,7 +69,7 @@ public class MergedSender extends ReplyToChangeSender { Table pos = HashBasedTable.create(); Table neg = HashBasedTable.create(); for (PatchSetApproval ca : - args.approvalsUtil.byPatchSet(changeData.notes(), patchSet.getId(), null, null)) { + args.approvalsUtil.byPatchSet(changeData.notes(), patchSet.id(), null, null)) { LabelType lt = labelTypes.byLabel(ca.getLabelId()); if (lt == null) { continue; diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesParser.java b/java/com/google/gerrit/server/notedb/ChangeNotesParser.java index 9f6d2eb965..84a2aa3420 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesParser.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesParser.java @@ -270,7 +270,7 @@ class ChangeNotesParser { for (Map.Entry e : patchSets.entrySet()) { try { PatchSet ps = e.getValue().build(); - result.put(ps.getId(), ps); + result.put(ps.id(), ps); } catch (Exception ex) { ConfigInvalidException cie = parseException("Error building patch set %s", e.getKey()); cie.initCause(ex); @@ -503,7 +503,7 @@ class ChangeNotesParser { // Do not update PS details as PS was deleted and this meta data is of no relevance. return; } - ObjectId commitId = patchSets.get(psId).getCommitId().orElseThrow(IllegalStateException::new); + ObjectId commitId = patchSets.get(psId).commitId().orElseThrow(IllegalStateException::new); throw new ConfigInvalidException( String.format( "Multiple revisions parsed for patch set %s: %s and %s", @@ -529,7 +529,7 @@ class ChangeNotesParser { } checkPatchSetCommitNotParsed(psId, FOOTER_GROUPS); PatchSet.Builder pending = patchSets.computeIfAbsent(psId, id -> PatchSet.builder()); - if (pending.getGroups().isEmpty()) { + if (pending.groups().isEmpty()) { pending.groups(PatchSet.splitGroups(groupsStr)); } } @@ -678,7 +678,7 @@ class ChangeNotesParser { if (descLines.size() == 1) { String desc = descLines.get(0).trim(); PatchSet.Builder pending = patchSets.computeIfAbsent(psId, p -> PatchSet.builder()); - if (!pending.getDescription().isPresent()) { + if (!pending.description().isPresent()) { pending.description(Optional.of(desc)); } } else { @@ -740,11 +740,10 @@ class ChangeNotesParser { for (PatchSet.Builder b : patchSets.values()) { ObjectId commitId = - b.getCommitId() + b.commitId() .orElseThrow( () -> - new IllegalStateException( - "never parsed commit ID for patch set " + b.getId())); + new IllegalStateException("never parsed commit ID for patch set " + b.id())); ChangeRevisionNote rn = rns.get(commitId); if (rn != null && rn.getPushCert() != null) { b.pushCertificate(Optional.of(rn.getPushCert())); @@ -1109,7 +1108,7 @@ class ChangeNotesParser { private boolean patchSetCommitParsed(PatchSet.Id psId) { PatchSet.Builder pending = patchSets.get(psId); - return pending != null && pending.getCommitId().isPresent(); + return pending != null && pending.commitId().isPresent(); } private ConfigInvalidException parseException(String fmt, Object... args) { diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesState.java b/java/com/google/gerrit/server/notedb/ChangeNotesState.java index 74f32ab1a7..8d3343cb96 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesState.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesState.java @@ -555,7 +555,7 @@ public abstract class ChangeNotesState { .patchSets( proto.getPatchSetList().stream() .map(bytes -> parseProtoFrom(PatchSetProtoConverter.INSTANCE, bytes)) - .map(ps -> Maps.immutableEntry(ps.getId(), ps)) + .map(ps -> Maps.immutableEntry(ps.id(), ps)) .collect(toImmutableList())) .approvals( proto.getApprovalList().stream() diff --git a/java/com/google/gerrit/server/patch/PatchListCacheImpl.java b/java/com/google/gerrit/server/patch/PatchListCacheImpl.java index 0919e416e9..8201947597 100644 --- a/java/com/google/gerrit/server/patch/PatchListCacheImpl.java +++ b/java/com/google/gerrit/server/patch/PatchListCacheImpl.java @@ -134,7 +134,7 @@ public class PatchListCacheImpl implements PatchListCache { private PatchList get(Change change, PatchSet patchSet, Integer parentNum) throws PatchListNotAvailableException { Project.NameKey project = change.getProject(); - ObjectId b = patchSet.getCommitId(); + ObjectId b = patchSet.commitId(); Whitespace ws = Whitespace.IGNORE_NONE; if (parentNum != null) { return get(PatchListKey.againstParentNum(parentNum, b, ws), project); diff --git a/java/com/google/gerrit/server/patch/PatchScriptFactory.java b/java/com/google/gerrit/server/patch/PatchScriptFactory.java index 61de8eef5f..ec05200936 100644 --- a/java/com/google/gerrit/server/patch/PatchScriptFactory.java +++ b/java/com/google/gerrit/server/patch/PatchScriptFactory.java @@ -268,7 +268,7 @@ public class PatchScriptFactory implements Callable { if (ps == null) { throw new NoSuchChangeException(psId.changeId()); } - return ps.getCommitId(); + return ps.commitId(); } private ObjectId getEditRev() throws AuthException, IOException { @@ -303,7 +303,7 @@ public class PatchScriptFactory implements Callable { switch (changeType) { case COPIED: case RENAMED: - if (ps.getId().equals(psa)) { + if (ps.id().equals(psa)) { name = oldName; } break; @@ -316,7 +316,7 @@ public class PatchScriptFactory implements Callable { } } - Patch p = new Patch(Patch.key(ps.getId(), name)); + Patch p = new Patch(Patch.key(ps.id(), name)); history.add(p); byKey.put(p.getKey(), p); } diff --git a/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java b/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java index acc789b159..c684da5181 100644 --- a/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java +++ b/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java @@ -76,8 +76,8 @@ public class PatchSetInfoFactory { throws PatchSetInfoNotAvailableException { try (Repository repo = repoManager.openRepository(project); RevWalk rw = new RevWalk(repo)) { - RevCommit src = rw.parseCommit(patchSet.getCommitId()); - PatchSetInfo info = get(rw, src, patchSet.getId()); + RevCommit src = rw.parseCommit(patchSet.commitId()); + PatchSetInfo info = get(rw, src, patchSet.id()); info.setParents(toParentInfos(src.getParents(), rw)); return info; } catch (IOException | StorageException e) { diff --git a/java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java b/java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java index 51bdc0bd08..83393bcc84 100644 --- a/java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java +++ b/java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java @@ -297,7 +297,7 @@ public class ProjectsConsistencyChecker { // Auto-close by commit for (ObjectId patchSetSha1 : autoCloseableChange.patchSets().stream() - .map(PatchSet::getCommitId) + .map(PatchSet::commitId) .collect(toSet())) { if (mergedSha1s.contains(patchSetSha1)) { autoCloseableChangesByBranch.add( diff --git a/java/com/google/gerrit/server/query/change/ChangeData.java b/java/com/google/gerrit/server/query/change/ChangeData.java index 06691adca1..d3b57d713a 100644 --- a/java/com/google/gerrit/server/query/change/ChangeData.java +++ b/java/com/google/gerrit/server/query/change/ChangeData.java @@ -394,7 +394,7 @@ public class ChangeData { return Optional.empty(); } - ObjectId id = ps.getCommitId(); + ObjectId id = ps.commitId(); Whitespace ws = Whitespace.IGNORE_NONE; PatchListKey pk = parentCount > 1 @@ -504,7 +504,7 @@ public class ChangeData { return null; } for (PatchSet p : patchSets()) { - if (p.getId().equals(c.currentPatchSetId())) { + if (p.id().equals(c.currentPatchSetId())) { currentPatchSet = p; return p; } @@ -589,7 +589,7 @@ public class ChangeData { } try (Repository repo = repoManager.openRepository(project()); RevWalk walk = new RevWalk(repo)) { - RevCommit c = walk.parseCommit(ps.getCommitId()); + RevCommit c = walk.parseCommit(ps.commitId()); commitMessage = c.getFullMessage(); commitFooters = c.getFooterLines(); author = c.getAuthorIdent(); @@ -616,11 +616,11 @@ public class ChangeData { /** @return patch with the given ID, or null if it does not exist. */ public PatchSet patchSet(PatchSet.Id psId) { - if (currentPatchSet != null && currentPatchSet.getId().equals(psId)) { + if (currentPatchSet != null && currentPatchSet.id().equals(psId)) { return currentPatchSet; } for (PatchSet ps : patchSets()) { - if (ps.getId().equals(psId)) { + if (ps.id().equals(psId)) { return ps; } } @@ -903,8 +903,7 @@ public class ChangeData { String mergeStrategy = mergeUtilFactory.create(projectCache.get(project())).mergeStrategyName(); mergeable = - mergeabilityCache.get( - ps.getCommitId(), ref, str.type, mergeStrategy, c.getDest(), repo); + mergeabilityCache.get(ps.commitId(), ref, str.type, mergeStrategy, c.getDest(), repo); } catch (IOException e) { throw new StorageException(e); } @@ -982,11 +981,11 @@ public class ChangeData { PatchSet ps = currentPatchSet(); if (ps != null) { - if (stars.contains(StarredChangesUtil.REVIEWED_LABEL + "/" + ps.getPatchSetId())) { + if (stars.contains(StarredChangesUtil.REVIEWED_LABEL + "/" + ps.number())) { return true; } - if (stars.contains(StarredChangesUtil.UNREVIEWED_LABEL + "/" + ps.getPatchSetId())) { + if (stars.contains(StarredChangesUtil.UNREVIEWED_LABEL + "/" + ps.number())) { return false; } } diff --git a/java/com/google/gerrit/server/query/change/CommitPredicate.java b/java/com/google/gerrit/server/query/change/CommitPredicate.java index f1ff2291f2..25d3ec3ccd 100644 --- a/java/com/google/gerrit/server/query/change/CommitPredicate.java +++ b/java/com/google/gerrit/server/query/change/CommitPredicate.java @@ -47,9 +47,9 @@ public class CommitPredicate extends ChangeIndexPredicate { protected boolean equals(PatchSet p, String id) { if (getField() == EXACT_COMMIT) { - return p.getCommitId().name().equals(id); + return p.commitId().name().equals(id); } - return matchesAbbreviation(p.getCommitId(), id); + return matchesAbbreviation(p.commitId(), id); } @Override diff --git a/java/com/google/gerrit/server/query/change/ConflictsPredicate.java b/java/com/google/gerrit/server/query/change/ConflictsPredicate.java index e08a6fdfaf..f18a5a7189 100644 --- a/java/com/google/gerrit/server/query/change/ConflictsPredicate.java +++ b/java/com/google/gerrit/server/query/change/ConflictsPredicate.java @@ -131,7 +131,7 @@ public class ConflictsPredicate { return false; } - other = object.currentPatchSet().getCommitId(); + other = object.currentPatchSet().commitId(); ConflictKey conflictsKey = ConflictKey.create( changeDataCache.getTestAgainst(), @@ -207,7 +207,7 @@ public class ConflictsPredicate { ObjectId getTestAgainst() { if (testAgainst == null) { - testAgainst = cd.currentPatchSet().getCommitId(); + testAgainst = cd.currentPatchSet().commitId(); } return testAgainst; } diff --git a/java/com/google/gerrit/server/query/change/GroupPredicate.java b/java/com/google/gerrit/server/query/change/GroupPredicate.java index 7f7bcff528..0e6f45d4e1 100644 --- a/java/com/google/gerrit/server/query/change/GroupPredicate.java +++ b/java/com/google/gerrit/server/query/change/GroupPredicate.java @@ -26,7 +26,7 @@ public class GroupPredicate extends ChangeIndexPredicate { @Override public boolean match(ChangeData cd) { for (PatchSet ps : cd.patchSets()) { - List groups = ps.getGroups(); + List groups = ps.groups(); if (groups != null && groups.contains(getValue())) { return true; } diff --git a/java/com/google/gerrit/server/restapi/change/ApplyFix.java b/java/com/google/gerrit/server/restapi/change/ApplyFix.java index c25a52d897..dc5c2b16a3 100644 --- a/java/com/google/gerrit/server/restapi/change/ApplyFix.java +++ b/java/com/google/gerrit/server/restapi/change/ApplyFix.java @@ -75,7 +75,7 @@ public class ApplyFix implements RestModifyView { try (Repository repository = gitRepositoryManager.openRepository(project)) { List treeModifications = fixReplacementInterpreter.toTreeModifications( - repository, projectState, patchSet.getCommitId(), fixResource.getFixReplacements()); + repository, projectState, patchSet.commitId(), fixResource.getFixReplacements()); ChangeEdit changeEdit = changeEditModifier.combineWithModifiedPatchSetTree( repository, revisionResource.getNotes(), patchSet, treeModifications); diff --git a/java/com/google/gerrit/server/restapi/change/ChangeEdits.java b/java/com/google/gerrit/server/restapi/change/ChangeEdits.java index 64789f9b18..5b1a584815 100644 --- a/java/com/google/gerrit/server/restapi/change/ChangeEdits.java +++ b/java/com/google/gerrit/server/restapi/change/ChangeEdits.java @@ -357,7 +357,7 @@ public class ChangeEdits implements ChildCollection { @Override public IncludedInInfo apply(ChangeResource rsrc) throws RestApiException, IOException { PatchSet ps = psUtil.current(rsrc.getNotes()); - return includedIn.apply(rsrc.getProject(), ps.getCommitId().name()); + return includedIn.apply(rsrc.getProject(), ps.commitId().name()); } } diff --git a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java index 4c2e790fff..afd9d8e961 100644 --- a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java +++ b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java @@ -143,7 +143,7 @@ public class CherryPickChange { throws IOException, InvalidChangeOperationException, IntegrationException, UpdateException, RestApiException, ConfigInvalidException, NoSuchProjectException { return cherryPick( - batchUpdateFactory, change, change.getProject(), patch.getCommitId(), input, dest); + batchUpdateFactory, change, change.getProject(), patch.commitId(), input, dest); } public Result cherryPick( diff --git a/java/com/google/gerrit/server/restapi/change/Comments.java b/java/com/google/gerrit/server/restapi/change/Comments.java index d9a0d57201..84771b13f0 100644 --- a/java/com/google/gerrit/server/restapi/change/Comments.java +++ b/java/com/google/gerrit/server/restapi/change/Comments.java @@ -58,7 +58,7 @@ public class Comments implements ChildCollection groups = null; if (!in.inheritParent && !in.baseChange.isEmpty()) { PatchSet basePS = findBasePatchSet(in.baseChange); - currentPsCommit = rw.parseCommit(basePS.getCommitId()); - groups = basePS.getGroups(); + currentPsCommit = rw.parseCommit(basePS.commitId()); + groups = basePS.groups(); } else { - currentPsCommit = rw.parseCommit(ps.getCommitId()); + currentPsCommit = rw.parseCommit(ps.commitId()); } Timestamp now = TimeUtil.nowTs(); @@ -176,7 +176,7 @@ public class CreateMergePatchSet author, ObjectId.fromString(change.getKey().get().substring(1))); - PatchSet.Id nextPsId = ChangeUtil.nextPatchSetId(ps.getId()); + PatchSet.Id nextPsId = ChangeUtil.nextPatchSetId(ps.id()); PatchSetInserter psInserter = patchSetInserterFactory.create(rsrc.getNotes(), nextPsId, newCommit); try (BatchUpdate bu = updateFactory.create(project, me, now)) { diff --git a/java/com/google/gerrit/server/restapi/change/DownloadContent.java b/java/com/google/gerrit/server/restapi/change/DownloadContent.java index 9107666bd9..60741e7e57 100644 --- a/java/com/google/gerrit/server/restapi/change/DownloadContent.java +++ b/java/com/google/gerrit/server/restapi/change/DownloadContent.java @@ -45,6 +45,6 @@ public class DownloadContent implements RestReadView { String path = rsrc.getPatchKey().fileName(); RevisionResource rev = rsrc.getRevision(); return fileContentUtil.downloadContent( - projectCache.checkedGet(rev.getProject()), rev.getPatchSet().getCommitId(), path, parent); + projectCache.checkedGet(rev.getProject()), rev.getPatchSet().commitId(), path, parent); } } diff --git a/java/com/google/gerrit/server/restapi/change/DraftComments.java b/java/com/google/gerrit/server/restapi/change/DraftComments.java index dd61ca0855..6a1e0f1176 100644 --- a/java/com/google/gerrit/server/restapi/change/DraftComments.java +++ b/java/com/google/gerrit/server/restapi/change/DraftComments.java @@ -66,7 +66,7 @@ public class DraftComments implements ChildCollection { Response.ok( fileInfoJson.toFileInfoMap( resource.getChange(), - resource.getPatchSet().getCommitId(), + resource.getPatchSet().commitId(), baseResource.getPatchSet())); } else if (parentNum > 0) { r = Response.ok( fileInfoJson.toFileInfoMap( - resource.getChange(), resource.getPatchSet().getCommitId(), parentNum - 1)); + resource.getChange(), resource.getPatchSet().commitId(), parentNum - 1)); } else { r = Response.ok(fileInfoJson.toFileInfoMap(resource.getChange(), resource.getPatchSet())); } @@ -205,7 +205,7 @@ public class Files implements ChildCollection { ObjectReader or = git.newObjectReader(); RevWalk rw = new RevWalk(or); TreeWalk tw = new TreeWalk(or)) { - RevCommit c = rw.parseCommit(resource.getPatchSet().getCommitId()); + RevCommit c = rw.parseCommit(resource.getPatchSet().commitId()); tw.addTree(c.getTree()); tw.setRecursive(true); @@ -229,11 +229,11 @@ public class Files implements ChildCollection { Account.Id userId = user.getAccountId(); PatchSet patchSetId = resource.getPatchSet(); Optional o; - o = accountPatchReviewStore.call(s -> s.findReviewed(patchSetId.getId(), userId)); + o = accountPatchReviewStore.call(s -> s.findReviewed(patchSetId.id(), userId)); if (o.isPresent()) { PatchSetWithReviewedFiles res = o.get(); - if (res.patchSetId().equals(patchSetId.getId())) { + if (res.patchSetId().equals(patchSetId.id())) { return res.files(); } @@ -312,7 +312,7 @@ public class Files implements ChildCollection { } accountPatchReviewStore.run( - s -> s.markReviewed(resource.getPatchSet().getId(), userId, pathList)); + s -> s.markReviewed(resource.getPatchSet().id(), userId, pathList)); return pathList; } } diff --git a/java/com/google/gerrit/server/restapi/change/Fixes.java b/java/com/google/gerrit/server/restapi/change/Fixes.java index 855d1f48cb..9255ee32d5 100644 --- a/java/com/google/gerrit/server/restapi/change/Fixes.java +++ b/java/com/google/gerrit/server/restapi/change/Fixes.java @@ -54,7 +54,7 @@ public class Fixes implements ChildCollection { ChangeNotes changeNotes = revisionResource.getNotes(); List robotComments = - commentsUtil.robotCommentsByPatchSet(changeNotes, revisionResource.getPatchSet().getId()); + commentsUtil.robotCommentsByPatchSet(changeNotes, revisionResource.getPatchSet().id()); for (RobotComment robotComment : robotComments) { for (FixSuggestion fixSuggestion : robotComment.fixSuggestions) { if (Objects.equals(fixId, fixSuggestion.fixId)) { diff --git a/java/com/google/gerrit/server/restapi/change/GetArchive.java b/java/com/google/gerrit/server/restapi/change/GetArchive.java index 5315ce1c34..2bf47e31fb 100644 --- a/java/com/google/gerrit/server/restapi/change/GetArchive.java +++ b/java/com/google/gerrit/server/restapi/change/GetArchive.java @@ -66,7 +66,7 @@ public class GetArchive implements RestReadView { final RevCommit commit; String name; try (RevWalk rw = new RevWalk(repo)) { - commit = rw.parseCommit(rsrc.getPatchSet().getCommitId()); + commit = rw.parseCommit(rsrc.getPatchSet().commitId()); name = name(f, rw, commit); } diff --git a/java/com/google/gerrit/server/restapi/change/GetBlame.java b/java/com/google/gerrit/server/restapi/change/GetBlame.java index d66deb3519..cade702517 100644 --- a/java/com/google/gerrit/server/restapi/change/GetBlame.java +++ b/java/com/google/gerrit/server/restapi/change/GetBlame.java @@ -87,7 +87,7 @@ public class GetBlame implements RestReadView { String refName = resource.getRevision().getEdit().isPresent() ? resource.getRevision().getEdit().get().getRefName() - : resource.getRevision().getPatchSet().getRefName(); + : resource.getRevision().getPatchSet().refName(); Ref ref = repository.findRef(refName); if (ref == null) { diff --git a/java/com/google/gerrit/server/restapi/change/GetCommit.java b/java/com/google/gerrit/server/restapi/change/GetCommit.java index a6a44ad10e..aeaafc4cb2 100644 --- a/java/com/google/gerrit/server/restapi/change/GetCommit.java +++ b/java/com/google/gerrit/server/restapi/change/GetCommit.java @@ -54,7 +54,7 @@ public class GetCommit implements RestReadView { Project.NameKey p = rsrc.getChange().getProject(); try (Repository repo = repoManager.openRepository(p); RevWalk rw = new RevWalk(repo)) { - RevCommit commit = rw.parseCommit(rsrc.getPatchSet().getCommitId()); + RevCommit commit = rw.parseCommit(rsrc.getPatchSet().commitId()); rw.parseBody(commit); CommitInfo info = json.create(ImmutableSet.of()) diff --git a/java/com/google/gerrit/server/restapi/change/GetContent.java b/java/com/google/gerrit/server/restapi/change/GetContent.java index fbc52f344a..62889a3921 100644 --- a/java/com/google/gerrit/server/restapi/change/GetContent.java +++ b/java/com/google/gerrit/server/restapi/change/GetContent.java @@ -76,7 +76,7 @@ public class GetContent implements RestReadView { } return fileContentUtil.getContent( projectCache.checkedGet(rsrc.getRevision().getProject()), - rsrc.getRevision().getPatchSet().getCommitId(), + rsrc.getRevision().getPatchSet().commitId(), path, parent); } @@ -90,7 +90,7 @@ public class GetContent implements RestReadView { try (Repository git = gitManager.openRepository(notes.getProjectName()); RevWalk revWalk = new RevWalk(git)) { - RevCommit commit = revWalk.parseCommit(ps.getCommitId()); + RevCommit commit = revWalk.parseCommit(ps.commitId()); return commit.getFullMessage(); } catch (RepositoryNotFoundException e) { throw new NoSuchChangeException(changeId, e); @@ -107,7 +107,7 @@ public class GetContent implements RestReadView { try (Repository git = gitManager.openRepository(notes.getProjectName()); RevWalk revWalk = new RevWalk(git)) { return Text.forMergeList( - ComparisonType.againstAutoMerge(), revWalk.getObjectReader(), ps.getCommitId()) + ComparisonType.againstAutoMerge(), revWalk.getObjectReader(), ps.commitId()) .getContent(); } catch (RepositoryNotFoundException e) { throw new NoSuchChangeException(changeId, e); diff --git a/java/com/google/gerrit/server/restapi/change/GetDescription.java b/java/com/google/gerrit/server/restapi/change/GetDescription.java index fcb6bc355a..c30bd0d970 100644 --- a/java/com/google/gerrit/server/restapi/change/GetDescription.java +++ b/java/com/google/gerrit/server/restapi/change/GetDescription.java @@ -22,6 +22,6 @@ import com.google.inject.Singleton; public class GetDescription implements RestReadView { @Override public String apply(RevisionResource rsrc) { - return rsrc.getPatchSet().getDescription().orElse(""); + return rsrc.getPatchSet().description().orElse(""); } } diff --git a/java/com/google/gerrit/server/restapi/change/GetDiff.java b/java/com/google/gerrit/server/restapi/change/GetDiff.java index 8b5cdaf757..5912a3ebee 100644 --- a/java/com/google/gerrit/server/restapi/change/GetDiff.java +++ b/java/com/google/gerrit/server/restapi/change/GetDiff.java @@ -147,7 +147,7 @@ public class GetDiff implements RestReadView { RevisionResource baseResource = revisions.parse(resource.getRevision().getChangeResource(), IdString.fromDecoded(base)); basePatchSet = baseResource.getPatchSet(); - psf = patchScriptFactoryFactory.create(notes, fileName, basePatchSet.getId(), pId, prefs); + psf = patchScriptFactoryFactory.create(notes, fileName, basePatchSet.id(), pId, prefs); } else if (parentNum > 0) { psf = patchScriptFactoryFactory.create(notes, fileName, parentNum - 1, pId, prefs); } else { @@ -195,17 +195,17 @@ public class GetDiff implements RestReadView { ProjectState state = projectCache.get(resource.getRevision().getChange().getProject()); DiffInfo result = new DiffInfo(); - String revA = basePatchSet != null ? basePatchSet.getRefName() : content.commitIdA; + String revA = basePatchSet != null ? basePatchSet.refName() : content.commitIdA; String revB = resource.getRevision().getEdit().isPresent() ? resource.getRevision().getEdit().get().getRefName() - : resource.getRevision().getPatchSet().getRefName(); + : resource.getRevision().getPatchSet().refName(); List links = webLinks.getDiffLinks( state.getName(), resource.getPatchKey().patchSetId().changeId().get(), - basePatchSet != null ? basePatchSet.getId().get() : null, + basePatchSet != null ? basePatchSet.id().get() : null, revA, MoreObjects.firstNonNull(ps.getOldName(), ps.getNewName()), resource.getPatchKey().patchSetId().get(), diff --git a/java/com/google/gerrit/server/restapi/change/GetMergeList.java b/java/com/google/gerrit/server/restapi/change/GetMergeList.java index bece3e0c35..48d6dcbc90 100644 --- a/java/com/google/gerrit/server/restapi/change/GetMergeList.java +++ b/java/com/google/gerrit/server/restapi/change/GetMergeList.java @@ -66,7 +66,7 @@ public class GetMergeList implements RestReadView { Project.NameKey p = rsrc.getChange().getProject(); try (Repository repo = repoManager.openRepository(p); RevWalk rw = new RevWalk(repo)) { - RevCommit commit = rw.parseCommit(rsrc.getPatchSet().getCommitId()); + RevCommit commit = rw.parseCommit(rsrc.getPatchSet().commitId()); rw.parseBody(commit); if (uninterestingParent < 1 || uninterestingParent > commit.getParentCount()) { diff --git a/java/com/google/gerrit/server/restapi/change/GetPatch.java b/java/com/google/gerrit/server/restapi/change/GetPatch.java index edfa2a8a4a..186752e05f 100644 --- a/java/com/google/gerrit/server/restapi/change/GetPatch.java +++ b/java/com/google/gerrit/server/restapi/change/GetPatch.java @@ -66,7 +66,7 @@ public class GetPatch implements RestReadView { try { final RevWalk rw = new RevWalk(repo); try { - final RevCommit commit = rw.parseCommit(rsrc.getPatchSet().getCommitId()); + final RevCommit commit = rw.parseCommit(rsrc.getPatchSet().commitId()); RevCommit[] parents = commit.getParents(); if (parents.length > 1) { throw new ResourceConflictException("Revision has more than 1 parent."); diff --git a/java/com/google/gerrit/server/restapi/change/GetRelated.java b/java/com/google/gerrit/server/restapi/change/GetRelated.java index ad2c7d4a67..fab081b959 100644 --- a/java/com/google/gerrit/server/restapi/change/GetRelated.java +++ b/java/com/google/gerrit/server/restapi/change/GetRelated.java @@ -102,7 +102,7 @@ public class GetRelated implements RestReadView { for (RelatedChangesSorter.PatchSetData d : sorter.sort(cds, basePs)) { PatchSet ps = d.patchSet(); RevCommit commit; - if (isEdit && ps.getId().equals(basePs.getId())) { + if (isEdit && ps.id().equals(basePs.id())) { // Replace base of an edit with the edit itself. ps = rsrc.getPatchSet(); commit = rsrc.getEdit().get().getEditCommit(); @@ -114,7 +114,7 @@ public class GetRelated implements RestReadView { if (result.size() == 1) { RelatedChangeAndCommitInfo r = result.get(0); - if (r.commit != null && r.commit.commit.equals(rsrc.getPatchSet().getCommitId().name())) { + if (r.commit != null && r.commit.commit.equals(rsrc.getPatchSet().commitId().name())) { return Collections.emptyList(); } } @@ -123,13 +123,13 @@ public class GetRelated implements RestReadView { @VisibleForTesting public static Set getAllGroups(ChangeNotes notes, PatchSetUtil psUtil) { - return psUtil.byChange(notes).stream().flatMap(ps -> ps.getGroups().stream()).collect(toSet()); + return psUtil.byChange(notes).stream().flatMap(ps -> ps.groups().stream()).collect(toSet()); } private void reloadChangeIfStale(List cds, PatchSet wantedPs) { for (ChangeData cd : cds) { - if (cd.getId().equals(wantedPs.getId().changeId())) { - if (cd.patchSet(wantedPs.getId()) == null) { + if (cd.getId().equals(wantedPs.id().changeId())) { + if (cd.patchSet(wantedPs.id()) == null) { cd.reloadChange(); } } @@ -144,7 +144,7 @@ public class GetRelated implements RestReadView { if (change != null) { info.changeId = change.getKey().get(); info._changeNumber = change.getChangeId(); - info._revisionNumber = ps != null ? ps.getPatchSetId() : null; + info._revisionNumber = ps != null ? ps.number() : null; PatchSet.Id curr = change.currentPatchSetId(); info._currentRevisionNumber = curr != null ? curr.get() : null; info.status = ChangeUtil.status(change).toUpperCase(Locale.US); diff --git a/java/com/google/gerrit/server/restapi/change/ListRevisionComments.java b/java/com/google/gerrit/server/restapi/change/ListRevisionComments.java index b39ba63ed7..f2e5a3702f 100644 --- a/java/com/google/gerrit/server/restapi/change/ListRevisionComments.java +++ b/java/com/google/gerrit/server/restapi/change/ListRevisionComments.java @@ -37,6 +37,6 @@ public class ListRevisionComments extends ListRevisionDrafts { @Override protected Iterable listComments(RevisionResource rsrc) { ChangeNotes notes = rsrc.getNotes(); - return commentsUtil.publishedByPatchSet(notes, rsrc.getPatchSet().getId()); + return commentsUtil.publishedByPatchSet(notes, rsrc.getPatchSet().id()); } } diff --git a/java/com/google/gerrit/server/restapi/change/ListRevisionDrafts.java b/java/com/google/gerrit/server/restapi/change/ListRevisionDrafts.java index a46bd6c802..73b92f59b8 100644 --- a/java/com/google/gerrit/server/restapi/change/ListRevisionDrafts.java +++ b/java/com/google/gerrit/server/restapi/change/ListRevisionDrafts.java @@ -40,7 +40,7 @@ public class ListRevisionDrafts implements RestReadView { protected Iterable listComments(RevisionResource rsrc) { return commentsUtil.draftByPatchSetAuthor( - rsrc.getPatchSet().getId(), rsrc.getAccountId(), rsrc.getNotes()); + rsrc.getPatchSet().id(), rsrc.getAccountId(), rsrc.getNotes()); } protected boolean includeAuthorInfo() { diff --git a/java/com/google/gerrit/server/restapi/change/ListRobotComments.java b/java/com/google/gerrit/server/restapi/change/ListRobotComments.java index bbf46a3f70..d617a100b3 100644 --- a/java/com/google/gerrit/server/restapi/change/ListRobotComments.java +++ b/java/com/google/gerrit/server/restapi/change/ListRobotComments.java @@ -58,6 +58,6 @@ public class ListRobotComments implements RestReadView { } private Iterable listComments(RevisionResource rsrc) { - return commentsUtil.robotCommentsByPatchSet(rsrc.getNotes(), rsrc.getPatchSet().getId()); + return commentsUtil.robotCommentsByPatchSet(rsrc.getNotes(), rsrc.getPatchSet().id()); } } diff --git a/java/com/google/gerrit/server/restapi/change/Mergeable.java b/java/com/google/gerrit/server/restapi/change/Mergeable.java index 800ebfa7f6..f20e03d2af 100644 --- a/java/com/google/gerrit/server/restapi/change/Mergeable.java +++ b/java/com/google/gerrit/server/restapi/change/Mergeable.java @@ -94,7 +94,7 @@ public class Mergeable implements RestReadView { if (!change.isNew()) { throw new ResourceConflictException("change is " + ChangeUtil.status(change)); - } else if (!ps.getId().equals(change.currentPatchSetId())) { + } else if (!ps.id().equals(change.currentPatchSetId())) { // Only the current revision is mergeable. Others always fail. return result; } @@ -103,7 +103,7 @@ public class Mergeable implements RestReadView { result.submitType = getSubmitType(cd); try (Repository git = gitManager.openRepository(change.getProject())) { - ObjectId commit = ps.getCommitId(); + ObjectId commit = ps.commitId(); Ref ref = git.getRefDatabase().exactRef(change.getDest().branch()); ProjectState projectState = projectCache.get(change.getProject()); String strategy = mergeUtilFactory.create(projectState).mergeStrategyName(); diff --git a/java/com/google/gerrit/server/restapi/change/Move.java b/java/com/google/gerrit/server/restapi/change/Move.java index 1b0bc98348..ba220fe96a 100644 --- a/java/com/google/gerrit/server/restapi/change/Move.java +++ b/java/com/google/gerrit/server/restapi/change/Move.java @@ -193,7 +193,7 @@ public class Move extends RetryingRestModifyView 1) { throw new ResourceConflictException("Merge commit cannot be moved"); } diff --git a/java/com/google/gerrit/server/restapi/change/PostReview.java b/java/com/google/gerrit/server/restapi/change/PostReview.java index ab8f270cf9..551bfc17b5 100644 --- a/java/com/google/gerrit/server/restapi/change/PostReview.java +++ b/java/com/google/gerrit/server/restapi/change/PostReview.java @@ -356,8 +356,7 @@ public class PostReview // Add the review op. bu.addOp( - revision.getChange().getId(), - new Op(projectState, revision.getPatchSet().getId(), input)); + revision.getChange().getId(), new Op(projectState, revision.getPatchSet().id(), input)); // Notify based on ReviewInput, ignoring the notify settings from any AddReviewerInputs. NotifyResolver.Result notify = @@ -570,7 +569,7 @@ public class PostReview Set revisionFilePaths = getAffectedFilePaths(revision); for (Map.Entry> entry : commentsPerPath.entrySet()) { String path = entry.getKey(); - PatchSet.Id patchSetId = revision.getPatchSet().getId(); + PatchSet.Id patchSetId = revision.getPatchSet().id(); ensurePathRefersToAvailableOrMagicFile(path, revisionFilePaths, patchSetId); List comments = entry.getValue(); @@ -584,7 +583,7 @@ public class PostReview private Set getAffectedFilePaths(RevisionResource revision) throws PatchListNotAvailableException { - ObjectId newId = revision.getPatchSet().getCommitId(); + ObjectId newId = revision.getPatchSet().commitId(); DiffSummaryKey key = DiffSummaryKey.fromPatchListKey( PatchListKey.againstDefaultBase(newId, Whitespace.IGNORE_NONE)); diff --git a/java/com/google/gerrit/server/restapi/change/PutDescription.java b/java/com/google/gerrit/server/restapi/change/PutDescription.java index 0687677cfc..a2bff76c0a 100644 --- a/java/com/google/gerrit/server/restapi/change/PutDescription.java +++ b/java/com/google/gerrit/server/restapi/change/PutDescription.java @@ -57,7 +57,7 @@ public class PutDescription throws UpdateException, RestApiException, PermissionBackendException { rsrc.permissions().check(ChangePermission.EDIT_DESCRIPTION); - Op op = new Op(input != null ? input : new DescriptionInput(), rsrc.getPatchSet().getId()); + Op op = new Op(input != null ? input : new DescriptionInput(), rsrc.getPatchSet().id()); try (BatchUpdate u = updateFactory.create(rsrc.getChange().getProject(), rsrc.getUser(), TimeUtil.nowTs())) { u.addOp(rsrc.getChange().getId(), op); @@ -84,7 +84,7 @@ public class PutDescription public boolean updateChange(ChangeContext ctx) { ChangeUpdate update = ctx.getUpdate(psId); newDescription = Strings.nullToEmpty(input.description); - oldDescription = psUtil.get(ctx.getNotes(), psId).getDescription().orElse(""); + oldDescription = psUtil.get(ctx.getNotes(), psId).description().orElse(""); if (oldDescription.equals(newDescription)) { return false; } diff --git a/java/com/google/gerrit/server/restapi/change/PutMessage.java b/java/com/google/gerrit/server/restapi/change/PutMessage.java index 1f0c282746..db024188cc 100644 --- a/java/com/google/gerrit/server/restapi/change/PutMessage.java +++ b/java/com/google/gerrit/server/restapi/change/PutMessage.java @@ -119,7 +119,7 @@ public class PutMessage try (Repository repository = repositoryManager.openRepository(resource.getProject()); RevWalk revWalk = new RevWalk(repository); ObjectInserter objectInserter = repository.newObjectInserter()) { - RevCommit patchSetCommit = revWalk.parseCommit(ps.getCommitId()); + RevCommit patchSetCommit = revWalk.parseCommit(ps.commitId()); String currentCommitMessage = patchSetCommit.getFullMessage(); if (input.message.equals(currentCommitMessage)) { @@ -132,7 +132,7 @@ public class PutMessage // Ensure that BatchUpdate will update the same repo bu.setRepository(repository, new RevWalk(objectInserter.newReader()), objectInserter); - PatchSet.Id psId = ChangeUtil.nextPatchSetId(repository, ps.getId()); + PatchSet.Id psId = ChangeUtil.nextPatchSetId(repository, ps.id()); ObjectId newCommit = createCommit(objectInserter, patchSetCommit, sanitizedCommitMessage, ts); PatchSetInserter inserter = psInserterFactory.create(resource.getNotes(), psId, newCommit); diff --git a/java/com/google/gerrit/server/restapi/change/Rebase.java b/java/com/google/gerrit/server/restapi/change/Rebase.java index de88d9ae42..dbe9effdd6 100644 --- a/java/com/google/gerrit/server/restapi/change/Rebase.java +++ b/java/com/google/gerrit/server/restapi/change/Rebase.java @@ -159,7 +159,7 @@ public class Rebase extends RetryingRestModifyView byId = collectById(in); - PatchSetData start = byId.get(startPs.getCommitId()); + PatchSetData start = byId.get(startPs.commitId()); checkArgument(start != null, "%s not found in %s", startPs, in); // Map of patch set -> immediate parent. @@ -89,8 +89,8 @@ class RelatedChangesSorter { for (ChangeData cd : in) { for (PatchSet ps : cd.patchSets()) { - PatchSetData thisPsd = requireNonNull(byId.get(ps.getCommitId())); - if (cd.getId().equals(start.id()) && !ps.getId().equals(start.psId())) { + PatchSetData thisPsd = requireNonNull(byId.get(ps.commitId())); + if (cd.getId().equals(start.id()) && !ps.id().equals(start.psId())) { otherPatchSetsOfStart.add(thisPsd); } for (RevCommit p : thisPsd.commit().getParents()) { @@ -126,9 +126,9 @@ class RelatedChangesSorter { project, cd.change().getProject()); for (PatchSet ps : cd.patchSets()) { - RevCommit c = rw.parseCommit(ps.getCommitId()); + RevCommit c = rw.parseCommit(ps.commitId()); PatchSetData psd = PatchSetData.create(cd, ps, c); - result.put(ps.getCommitId(), psd); + result.put(ps.commitId(), psd); } } } @@ -251,7 +251,7 @@ class RelatedChangesSorter { abstract RevCommit commit(); PatchSet.Id psId() { - return patchSet().getId(); + return patchSet().id(); } Change.Id id() { @@ -260,7 +260,7 @@ class RelatedChangesSorter { @Override public int hashCode() { - return Objects.hash(patchSet().getId(), commit()); + return Objects.hash(patchSet().id(), commit()); } @Override @@ -269,7 +269,7 @@ class RelatedChangesSorter { return false; } PatchSetData o = (PatchSetData) obj; - return Objects.equals(patchSet().getId(), o.patchSet().getId()) + return Objects.equals(patchSet().id(), o.patchSet().id()) && Objects.equals(commit(), o.commit()); } } diff --git a/java/com/google/gerrit/server/restapi/change/Revert.java b/java/com/google/gerrit/server/restapi/change/Revert.java index d854d9f07a..dc6a073a42 100644 --- a/java/com/google/gerrit/server/restapi/change/Revert.java +++ b/java/com/google/gerrit/server/restapi/change/Revert.java @@ -172,7 +172,7 @@ public class Revert extends RetryingRestModifyView out = new ArrayList<>(); for (PatchSet ps : psUtil.byChange(change.getNotes())) { - if (ObjectIds.matchesAbbreviation(ps.getCommitId(), id)) { + if (ObjectIds.matchesAbbreviation(ps.commitId(), id)) { out.add(new RevisionResource(change, ps)); } } diff --git a/java/com/google/gerrit/server/restapi/change/RobotComments.java b/java/com/google/gerrit/server/restapi/change/RobotComments.java index 1aa8c2ac92..4ff8ca92a2 100644 --- a/java/com/google/gerrit/server/restapi/change/RobotComments.java +++ b/java/com/google/gerrit/server/restapi/change/RobotComments.java @@ -59,7 +59,7 @@ public class RobotComments implements ChildCollection params = ImmutableMap.of( - "patchSet", String.valueOf(resource.getPatchSet().getPatchSetId()), + "patchSet", String.valueOf(resource.getPatchSet().number()), "branch", change.getDest().shortName(), - "commit", abbreviateName(resource.getPatchSet().getCommitId()), + "commit", abbreviateName(resource.getPatchSet().commitId()), "submitSize", String.valueOf(cs.size())); ParameterizedString tp = cs.size() > 1 ? titlePatternWithAncestors : titlePattern; return new UiAction.Description() @@ -432,7 +432,7 @@ public class Submit try (Repository repo = repoManager.openRepository(project); RevWalk walk = new RevWalk(repo)) { for (ChangeData change : changes) { - RevCommit commit = walk.parseCommit(psUtil.current(change.notes()).getCommitId()); + RevCommit commit = walk.parseCommit(psUtil.current(change.notes()).commitId()); commits.put(change.getId(), commit); } } diff --git a/java/com/google/gerrit/server/rules/IgnoreSelfApprovalRule.java b/java/com/google/gerrit/server/rules/IgnoreSelfApprovalRule.java index 592c269cc8..359c2d9d0d 100644 --- a/java/com/google/gerrit/server/rules/IgnoreSelfApprovalRule.java +++ b/java/com/google/gerrit/server/rules/IgnoreSelfApprovalRule.java @@ -79,7 +79,7 @@ public class IgnoreSelfApprovalRule implements SubmitRule { Account.Id uploader; try { - uploader = cd.currentPatchSet().getUploader(); + uploader = cd.currentPatchSet().uploader(); } catch (StorageException e) { logger.atWarning().withCause(e).log(E_UNABLE_TO_FETCH_UPLOADER); return singletonRuleError(E_UNABLE_TO_FETCH_UPLOADER); diff --git a/java/com/google/gerrit/server/rules/StoredValues.java b/java/com/google/gerrit/server/rules/StoredValues.java index 2eb6d868e8..40f0ff5ea9 100644 --- a/java/com/google/gerrit/server/rules/StoredValues.java +++ b/java/com/google/gerrit/server/rules/StoredValues.java @@ -96,7 +96,7 @@ public final class StoredValues { Change change = getChange(engine); Project.NameKey project = change.getProject(); Whitespace ws = Whitespace.IGNORE_NONE; - PatchListKey plKey = PatchListKey.againstDefaultBase(ps.getCommitId(), ws); + PatchListKey plKey = PatchListKey.againstDefaultBase(ps.commitId(), ws); PatchList patchList; try { patchList = plCache.get(plKey, project); diff --git a/java/com/google/gerrit/server/submit/CherryPick.java b/java/com/google/gerrit/server/submit/CherryPick.java index 8ff3cc5dbc..4d57591501 100644 --- a/java/com/google/gerrit/server/submit/CherryPick.java +++ b/java/com/google/gerrit/server/submit/CherryPick.java @@ -162,7 +162,7 @@ public class CherryPick extends SubmitStrategy { ctx.getUpdate(psId), psId, newCommit, - prevPs != null ? prevPs.getGroups() : ImmutableList.of(), + prevPs != null ? prevPs.groups() : ImmutableList.of(), null, null); ctx.getChange().setCurrentPatchSet(patchSetInfo); diff --git a/java/com/google/gerrit/server/submit/CommitMergeStatus.java b/java/com/google/gerrit/server/submit/CommitMergeStatus.java index 6f21138e45..2ca0ec51c9 100644 --- a/java/com/google/gerrit/server/submit/CommitMergeStatus.java +++ b/java/com/google/gerrit/server/submit/CommitMergeStatus.java @@ -103,24 +103,22 @@ public enum CommitMergeStatus { commit, otherCommit, caller != null ? caller.getLoggableName() : ""); } else if (changes.size() == 1) { ChangeData cd = changes.get(0); - if (cd.currentPatchSet().getCommitId().name().equals(otherCommit)) { + if (cd.currentPatchSet().commitId().name().equals(otherCommit)) { return String.format( "Commit %s depends on commit %s of change %d which cannot be merged.", commit, otherCommit, cd.getId().get()); } Optional patchSet = - cd.patchSets().stream() - .filter(ps -> ps.getCommitId().name().equals(otherCommit)) - .findAny(); + cd.patchSets().stream().filter(ps -> ps.commitId().name().equals(otherCommit)).findAny(); if (patchSet.isPresent()) { return String.format( "Commit %s depends on commit %s, which is outdated patch set %d of change %d." + " The latest patch set is %d.", commit, otherCommit, - patchSet.get().getId().get(), + patchSet.get().id().get(), cd.getId().get(), - cd.currentPatchSet().getId().get()); + cd.currentPatchSet().id().get()); } // should not happen, fall-back to default message return String.format( diff --git a/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java b/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java index 580db67782..bb6a2e5131 100644 --- a/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java +++ b/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java @@ -134,7 +134,7 @@ public class LocalMergeSuperSetComputation implements MergeSuperSetComputation { } // Get the underlying git commit object - RevCommit commit = or.rw.parseCommit(cd.currentPatchSet().getCommitId()); + RevCommit commit = or.rw.parseCommit(cd.currentPatchSet().commitId()); // Always include the input, even if merged. This allows // SubmitStrategyOp to correct the situation later, assuming it gets diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java index b21dd5f0d9..06c52c7a1a 100644 --- a/java/com/google/gerrit/server/submit/MergeOp.java +++ b/java/com/google/gerrit/server/submit/MergeOp.java @@ -296,7 +296,7 @@ public class MergeOp implements AutoCloseable { throw new IllegalStateException( String.format( "SubmitRuleEvaluator.evaluate for change %s returned empty list for %s in %s", - cd.getId(), patchSet.getId(), cd.change().getProject().get())); + cd.getId(), patchSet.id(), cd.change().getProject().get())); } for (SubmitRecord record : results) { @@ -318,7 +318,7 @@ public class MergeOp implements AutoCloseable { throw new IllegalStateException( String.format( "Unexpected SubmitRecord status %s for %s in %s", - record.status, patchSet.getId().getId(), cd.change().getProject().get())); + record.status, patchSet.id().getId(), cd.change().getProject().get())); } } throw new IllegalStateException(); @@ -781,9 +781,9 @@ public class MergeOp implements AutoCloseable { continue; } - ObjectId id = ps.getCommitId(); - if (!revisions.containsEntry(id, ps.getId())) { - if (revisions.containsValue(ps.getId())) { + ObjectId id = ps.commitId(); + if (!revisions.containsEntry(id, ps.id())) { + if (revisions.containsValue(ps.id())) { // TODO This is actually an error, the patch set ref exists but points to a revision that // is different from the revision that we have stored for the patch set in the change // meta data. @@ -792,9 +792,9 @@ public class MergeOp implements AutoCloseable { "Revision " + id.name() + " of patch set " - + ps.getPatchSetId() + + ps.number() + " does not match the revision of the patch set ref " - + ps.getId().toRefName()); + + ps.id().toRefName()); continue; } @@ -805,9 +805,9 @@ public class MergeOp implements AutoCloseable { commitStatus.logProblem( changeId, "Patch set ref " - + ps.getId().toRefName() + + ps.id().toRefName() + " not found. Expected patch set ref of " - + ps.getPatchSetId() + + ps.number() + " to point to revision " + id.name()); continue; @@ -822,13 +822,12 @@ public class MergeOp implements AutoCloseable { } commit.setNotes(notes); - commit.setPatchsetId(ps.getId()); + commit.setPatchsetId(ps.id()); commitStatus.put(commit); MergeValidators mergeValidators = mergeValidatorsFactory.create(); try { - mergeValidators.validatePreMerge( - or.repo, commit, or.project, destBranch, ps.getId(), caller); + mergeValidators.validatePreMerge(or.repo, commit, or.project, destBranch, ps.id(), caller); } catch (MergeValidationException mve) { commitStatus.problem(changeId, mve.getMessage()); continue; diff --git a/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java b/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java index 342ae69898..b8fb06706a 100644 --- a/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java +++ b/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java @@ -234,7 +234,7 @@ public class RebaseSubmitStrategy extends SubmitStrategy { ctx.getUpdate(newPatchSetId), newPatchSetId, newCommit, - prevPs != null ? prevPs.getGroups() : ImmutableList.of(), + prevPs != null ? prevPs.groups() : ImmutableList.of(), null, null); } diff --git a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java index 02dfd09480..3dc8054b5d 100644 --- a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java +++ b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java @@ -252,7 +252,7 @@ abstract class SubmitStrategyOp implements BatchUpdateOp { args.psUtil.get(ctx.getNotes(), oldPsId), () -> String.format("missing old patch set %s", oldPsId)); } else { - PatchSet.Id n = newPatchSet.getId(); + PatchSet.Id n = newPatchSet.id(); checkState( !n.equals(oldPsId) && n.equals(newPsId), "current patch was %s and is now %s, but updateChangeImpl returned" @@ -312,7 +312,7 @@ abstract class SubmitStrategyOp implements BatchUpdateOp { // a patch set ref. Fix up the database. Note that this uses the current // user as the uploader, which is as good a guess as any. List groups = - prevPs != null ? prevPs.getGroups() : GroupCollector.getDefaultGroups(alreadyMergedCommit); + prevPs != null ? prevPs.groups() : GroupCollector.getDefaultGroups(alreadyMergedCommit); return args.psUtil.insert( ctx.getRevWalk(), ctx.getUpdate(psId), psId, alreadyMergedCommit, groups, null, null); } diff --git a/java/com/google/gerrit/sshd/commands/PatchSetParser.java b/java/com/google/gerrit/sshd/commands/PatchSetParser.java index e8ff69766c..377e1ac0ee 100644 --- a/java/com/google/gerrit/sshd/commands/PatchSetParser.java +++ b/java/com/google/gerrit/sshd/commands/PatchSetParser.java @@ -76,7 +76,7 @@ public class PatchSetParser { continue; } for (PatchSet ps : cd.patchSets()) { - if (ObjectIds.matchesAbbreviation(ps.getCommitId(), token)) { + if (ObjectIds.matchesAbbreviation(ps.commitId(), token)) { matches.add(ps); } } diff --git a/java/com/google/gerrit/sshd/commands/ReviewCommand.java b/java/com/google/gerrit/sshd/commands/ReviewCommand.java index e16ff49aeb..2c54e4a92f 100644 --- a/java/com/google/gerrit/sshd/commands/ReviewCommand.java +++ b/java/com/google/gerrit/sshd/commands/ReviewCommand.java @@ -227,11 +227,11 @@ public class ReviewCommand extends SshCommand { writeError("error", e.getMessage() + "\n"); } catch (NoSuchChangeException e) { ok = false; - writeError("error", "no such change " + patchSet.getId().changeId().get()); + writeError("error", "no such change " + patchSet.id().changeId().get()); } catch (Exception e) { ok = false; - writeError("fatal", "internal server error while reviewing " + patchSet.getId() + "\n"); - logger.atSevere().withCause(e).log("internal error while reviewing %s", patchSet.getId()); + writeError("fatal", "internal server error while reviewing " + patchSet.id() + "\n"); + logger.atSevere().withCause(e).log("internal error while reviewing %s", patchSet.id()); } } @@ -242,8 +242,8 @@ public class ReviewCommand extends SshCommand { private void applyReview(PatchSet patchSet, ReviewInput review) throws RestApiException { gApi.changes() - .id(patchSet.getId().changeId().get()) - .revision(patchSet.getCommitId().name()) + .id(patchSet.id().changeId().get()) + .revision(patchSet.commitId().name()) .review(review); } @@ -310,11 +310,11 @@ public class ReviewCommand extends SshCommand { } private ChangeApi changeApi(PatchSet patchSet) throws RestApiException { - return gApi.changes().id(patchSet.getId().changeId().get()); + return gApi.changes().id(patchSet.id().changeId().get()); } private RevisionApi revisionApi(PatchSet patchSet) throws RestApiException { - return changeApi(patchSet).revision(patchSet.getCommitId().name()); + return changeApi(patchSet).revision(patchSet.commitId().name()); } @Override diff --git a/java/gerrit/PRED_uploader_1.java b/java/gerrit/PRED_uploader_1.java index 029b84af09..feb83023b3 100644 --- a/java/gerrit/PRED_uploader_1.java +++ b/java/gerrit/PRED_uploader_1.java @@ -50,7 +50,7 @@ public class PRED_uploader_1 extends Predicate.P1 { return engine.fail(); } - Account.Id uploaderId = patchSet.getUploader(); + Account.Id uploaderId = patchSet.uploader(); if (!a1.unify(new StructureTerm(user, new IntegerTerm(uploaderId.get())), engine.trail)) { return engine.fail(); diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index 0fed39b342..d9699fdb34 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -1303,23 +1303,23 @@ public class ChangeIT extends AbstractDaemonTest { ri.base = ""; gApi.changes().id(r3.getChangeId()).revision(r3.getCommit().name()).rebase(ri); PatchSet ps3 = r3.getPatchSet(); - assertThat(ps3.getId().get()).isEqualTo(2); + assertThat(ps3.id().get()).isEqualTo(2); // rebase r2 onto r3 (referenced by ref) - ri.base = ps3.getId().toRefName(); + ri.base = ps3.id().toRefName(); gApi.changes().id(r2.getChangeId()).revision(r2.getCommit().name()).rebase(ri); PatchSet ps2 = r2.getPatchSet(); - assertThat(ps2.getId().get()).isEqualTo(2); + assertThat(ps2.id().get()).isEqualTo(2); // rebase r1 onto r2 (referenced by commit) - ri.base = ps2.getCommitId().name(); + ri.base = ps2.commitId().name(); gApi.changes().id(r1.getChangeId()).revision(r1.getCommit().name()).rebase(ri); PatchSet ps1 = r1.getPatchSet(); - assertThat(ps1.getId().get()).isEqualTo(2); + assertThat(ps1.id().get()).isEqualTo(2); // rebase r1 onto r3 (referenced by change number) ri.base = String.valueOf(r3.getChange().getId().get()); - gApi.changes().id(r1.getChangeId()).revision(ps1.getCommitId().name()).rebase(ri); + gApi.changes().id(r1.getChangeId()).revision(ps1.commitId().name()).rebase(ri); assertThat(r1.getPatchSetId().get()).isEqualTo(3); } @@ -2982,7 +2982,7 @@ public class ChangeIT extends AbstractDaemonTest { r1.assertOkStatus(); // Fetch change - GitUtil.fetch(userTestRepo, r1.getPatchSet().getRefName() + ":ps"); + GitUtil.fetch(userTestRepo, r1.getPatchSet().refName() + ":ps"); userTestRepo.reset("ps"); // Amend change as user @@ -3002,7 +3002,7 @@ public class ChangeIT extends AbstractDaemonTest { r1.assertOkStatus(); // Fetch change - GitUtil.fetch(userTestRepo, r1.getPatchSet().getRefName() + ":ps"); + GitUtil.fetch(userTestRepo, r1.getPatchSet().refName() + ":ps"); userTestRepo.reset("ps"); // Amend change as user @@ -3026,7 +3026,7 @@ public class ChangeIT extends AbstractDaemonTest { r1.assertOkStatus(); // Fetch change - GitUtil.fetch(adminTestRepo, r1.getPatchSet().getRefName() + ":ps"); + GitUtil.fetch(adminTestRepo, r1.getPatchSet().refName() + ":ps"); adminTestRepo.reset("ps"); // Amend change as admin diff --git a/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java b/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java index 98420e6112..28d94d32ff 100644 --- a/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java +++ b/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java @@ -188,7 +188,7 @@ public class ChangeEditIT extends AbstractDaemonTest { adminRestSession.post(urlPublish(changeId)).assertNoContent(); assertThat(getEdit(changeId)).isAbsent(); PatchSet newCurrentPatchSet = getCurrentPatchSet(changeId); - assertThat(newCurrentPatchSet.getId()).isNotEqualTo(oldCurrentPatchSet.getId()); + assertThat(newCurrentPatchSet.id()).isNotEqualTo(oldCurrentPatchSet.id()); assertChangeMessages( changeId, ImmutableList.of( @@ -241,16 +241,13 @@ public class ChangeEditIT extends AbstractDaemonTest { PatchSet currentPatchSet = getCurrentPatchSet(changeId2); Optional originalEdit = getEdit(changeId2); - assertThat(originalEdit) - .value() - .baseRevision() - .isEqualTo(previousPatchSet.getCommitId().name()); + assertThat(originalEdit).value().baseRevision().isEqualTo(previousPatchSet.commitId().name()); Timestamp beforeRebase = originalEdit.get().commit.committer.date; gApi.changes().id(changeId2).edit().rebase(); ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME), CONTENT_NEW); ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME2), CONTENT_NEW2); Optional rebasedEdit = getEdit(changeId2); - assertThat(rebasedEdit).value().baseRevision().isEqualTo(currentPatchSet.getCommitId().name()); + assertThat(rebasedEdit).value().baseRevision().isEqualTo(currentPatchSet.commitId().name()); assertThat(rebasedEdit).value().commit().committer().date().isNotEqualTo(beforeRebase); } @@ -263,16 +260,13 @@ public class ChangeEditIT extends AbstractDaemonTest { PatchSet currentPatchSet = getCurrentPatchSet(changeId2); Optional originalEdit = getEdit(changeId2); - assertThat(originalEdit) - .value() - .baseRevision() - .isEqualTo(previousPatchSet.getCommitId().name()); + assertThat(originalEdit).value().baseRevision().isEqualTo(previousPatchSet.commitId().name()); Timestamp beforeRebase = originalEdit.get().commit.committer.date; adminRestSession.post(urlRebase(changeId2)).assertNoContent(); ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME), CONTENT_NEW); ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME2), CONTENT_NEW2); Optional rebasedEdit = getEdit(changeId2); - assertThat(rebasedEdit).value().baseRevision().isEqualTo(currentPatchSet.getCommitId().name()); + assertThat(rebasedEdit).value().baseRevision().isEqualTo(currentPatchSet.commitId().name()); assertThat(rebasedEdit).value().commit().committer().date().isNotEqualTo(beforeRebase); } @@ -282,7 +276,7 @@ public class ChangeEditIT extends AbstractDaemonTest { createEmptyEditFor(changeId2); gApi.changes().id(changeId2).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); Optional edit = getEdit(changeId2); - assertThat(edit).value().baseRevision().isEqualTo(currentPatchSet.getCommitId().name()); + assertThat(edit).value().baseRevision().isEqualTo(currentPatchSet.commitId().name()); PushOneCommit push = pushFactory.create( admin.newIdent(), @@ -397,7 +391,7 @@ public class ChangeEditIT extends AbstractDaemonTest { r = adminRestSession.getJsonAccept(urlEditMessage(changeId, true)); try (Repository repo = repoManager.openRepository(project); RevWalk rw = new RevWalk(repo)) { - RevCommit commit = rw.parseCommit(ObjectId.fromString(ps.getCommitId().name())); + RevCommit commit = rw.parseCommit(ObjectId.fromString(ps.commitId().name())); assertThat(readContentFromJson(r)).isEqualTo(commit.getFullMessage()); } diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java index 50001b1c57..bfbe3a32ed 100644 --- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java +++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java @@ -844,7 +844,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { assertThat(r.getChange().change().isWorkInProgress()).isTrue(); // Admin user trying to move from WIP to ready should succeed. - GitUtil.fetch(testRepo, r.getPatchSet().getRefName() + ":ps"); + GitUtil.fetch(testRepo, r.getPatchSet().refName() + ":ps"); testRepo.reset("ps"); r = amendChange(r.getChangeId(), "refs/for/master%ready", user, testRepo); r.assertOkStatus(); @@ -860,7 +860,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { assertThat(r.getChange().change().isWorkInProgress()).isFalse(); // Admin user trying to move from ready to WIP should succeed. - GitUtil.fetch(testRepo, r.getPatchSet().getRefName() + ":ps"); + GitUtil.fetch(testRepo, r.getPatchSet().refName() + ":ps"); testRepo.reset("ps"); r = amendChange(r.getChangeId(), "refs/for/master%wip", admin, testRepo); r.assertOkStatus(); @@ -874,7 +874,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { grant( project, "refs/*", Permission.FORGE_COMMITTER, false, SystemGroupBackend.REGISTERED_USERS); TestRepository user2Repo = cloneProject(project, user2); - GitUtil.fetch(user2Repo, r.getPatchSet().getRefName() + ":ps"); + GitUtil.fetch(user2Repo, r.getPatchSet().refName() + ":ps"); user2Repo.reset("ps"); r = amendChange(r.getChangeId(), "refs/for/master%ready", user2, user2Repo); r.assertErrorStatus(ReceiveConstants.ONLY_CHANGE_OWNER_OR_PROJECT_OWNER_CAN_MODIFY_WIP); @@ -1405,7 +1405,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { // create a second change as user (depends on the change from admin) TestRepository userRepo = cloneProject(project, user); - GitUtil.fetch(userRepo, r.getPatchSet().getRefName() + ":change"); + GitUtil.fetch(userRepo, r.getPatchSet().refName() + ":change"); userRepo.reset("change"); push = pushFactory.create( @@ -1802,7 +1802,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { throws Exception { Change.Id id = accidentallyPushNewPatchSetDirectlyToBranch(); ChangeData cd = byChangeId(id); - String ps1Rev = Iterables.getOnlyElement(cd.patchSets()).getCommitId().name(); + String ps1Rev = Iterables.getOnlyElement(cd.patchSets()).commitId().name(); String r = "refs/changes/" + id; assertPushOk(pushHead(testRepo, r, false), r); @@ -1820,7 +1820,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { throws Exception { Change.Id id = accidentallyPushNewPatchSetDirectlyToBranch(); ChangeData cd = byChangeId(id); - String ps1Rev = Iterables.getOnlyElement(cd.patchSets()).getCommitId().name(); + String ps1Rev = Iterables.getOnlyElement(cd.patchSets()).commitId().name(); String r = "refs/for/master"; assertPushRejected(pushHead(testRepo, r, false), r, "no new changes"); @@ -2627,7 +2627,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { private static Map getPatchSetRevisions(ChangeData cd) throws Exception { Map revisions = new HashMap<>(); for (PatchSet ps : cd.patchSets()) { - revisions.put(ps.getPatchSetId(), ps.getCommitId().name()); + revisions.put(ps.number(), ps.commitId().name()); } return revisions; } diff --git a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java index 7182b6f6d1..1fe6f60d84 100644 --- a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java +++ b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java @@ -145,25 +145,25 @@ public class RefAdvertisementIT extends AbstractDaemonTest { pushFactory.create(admin.newIdent(), testRepo).to("refs/for/master%submit"); mr.assertOkStatus(); cd1 = mr.getChange(); - psRef1 = cd1.currentPatchSet().getId().toRefName(); + psRef1 = cd1.currentPatchSet().id().toRefName(); metaRef1 = RefNames.changeMetaRef(cd1.getId()); PushOneCommit.Result br = pushFactory.create(admin.newIdent(), testRepo).to("refs/for/branch%submit"); br.assertOkStatus(); cd2 = br.getChange(); - psRef2 = cd2.currentPatchSet().getId().toRefName(); + psRef2 = cd2.currentPatchSet().id().toRefName(); metaRef2 = RefNames.changeMetaRef(cd2.getId()); // Second 2 changes are unmerged. mr = pushFactory.create(admin.newIdent(), testRepo).to("refs/for/master"); mr.assertOkStatus(); cd3 = mr.getChange(); - psRef3 = cd3.currentPatchSet().getId().toRefName(); + psRef3 = cd3.currentPatchSet().id().toRefName(); metaRef3 = RefNames.changeMetaRef(cd3.getId()); br = pushFactory.create(admin.newIdent(), testRepo).to("refs/for/branch"); br.assertOkStatus(); cd4 = br.getChange(); - psRef4 = cd4.currentPatchSet().getId().toRefName(); + psRef4 = cd4.currentPatchSet().id().toRefName(); metaRef4 = RefNames.changeMetaRef(cd4.getId()); try (Repository repo = repoManager.openRepository(project)) { @@ -570,7 +570,7 @@ public class RefAdvertisementIT extends AbstractDaemonTest { TestRepository userTestRepository = cloneProject(project, user); try (Git git = userTestRepository.git()) { - String change3RefName = cd3.currentPatchSet().getRefName(); + String change3RefName = cd3.currentPatchSet().refName(); assertWithMessage("Precondition violated").that(getRefs(git)).contains(change3RefName); gApi.changes().id(cd3.getId().get()).setPrivate(true, null); @@ -587,7 +587,7 @@ public class RefAdvertisementIT extends AbstractDaemonTest { TestRepository userTestRepository = cloneProject(project, user); try (Git git = userTestRepository.git()) { - String change3RefName = cd3.currentPatchSet().getRefName(); + String change3RefName = cd3.currentPatchSet().refName(); assertWithMessage("Precondition violated").that(getRefs(git)).contains(change3RefName); gApi.changes().id(cd3.getId().get()).setPrivate(true, null); @@ -603,7 +603,7 @@ public class RefAdvertisementIT extends AbstractDaemonTest { TestRepository userTestRepository = cloneProject(project, user); try (Git git = userTestRepository.git()) { - String change3RefName = cd3.currentPatchSet().getRefName(); + String change3RefName = cd3.currentPatchSet().refName(); assertWithMessage("Precondition violated").that(getRefs(git)).contains(change3RefName); gApi.changes().id(cd3.getId().get()).setPrivate(true, null); @@ -776,7 +776,7 @@ public class RefAdvertisementIT extends AbstractDaemonTest { 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 ps.getCommitId(); + return ps.commitId(); } private AccountGroup.UUID createSelfOwnedGroup(String name, TestAccount... members) diff --git a/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java b/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java index 3d0e11696d..88c59a26e7 100644 --- a/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java +++ b/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java @@ -158,13 +158,13 @@ public class SubmitOnPushIT extends AbstractDaemonTest { ChangeData cd = Iterables.getOnlyElement(queryProvider.get().byKey(Change.key(r.getChangeId()))); RevCommit c = r.getCommit(); - PatchSet.Id psId = cd.currentPatchSet().getId(); + PatchSet.Id psId = cd.currentPatchSet().id(); assertThat(psId.get()).isEqualTo(1); assertThat(cd.change().isMerged()).isTrue(); assertSubmitApproval(psId); assertThat(cd.patchSets()).hasSize(1); - assertThat(cd.patchSet(psId).getCommitId()).isEqualTo(c); + assertThat(cd.patchSet(psId).commitId()).isEqualTo(c); } @Test @@ -237,8 +237,8 @@ public class SubmitOnPushIT extends AbstractDaemonTest { assertSubmitApproval(psId2); assertThat(cd.patchSets()).hasSize(2); - assertThat(cd.patchSet(psId1).getCommitId()).isEqualTo(c1); - assertThat(cd.patchSet(psId2).getCommitId()).isEqualTo(c2); + assertThat(cd.patchSet(psId1).commitId()).isEqualTo(c1); + assertThat(cd.patchSet(psId2).commitId()).isEqualTo(c2); } @Test @@ -264,7 +264,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest { Change c = cd.change(); assertThat(c.isMerged()).isTrue(); assertThat(c.currentPatchSetId()).isEqualTo(psId1); - assertThat(cd.patchSets().stream().map(PatchSet::getId).collect(toList())) + assertThat(cd.patchSets().stream().map(PatchSet::id).collect(toList())) .containsExactly(psId1, psId2); } @@ -304,15 +304,15 @@ public class SubmitOnPushIT extends AbstractDaemonTest { assertThat(cd2.change().isMerged()).isTrue(); PatchSet.Id psId2_2 = cd2.change().currentPatchSetId(); assertThat(psId2_2.get()).isEqualTo(2); - assertThat(cd2.patchSet(psId2_1).getCommitId()).isEqualTo(c2_1); - assertThat(cd2.patchSet(psId2_2).getCommitId()).isEqualTo(c2_2); + assertThat(cd2.patchSet(psId2_1).commitId()).isEqualTo(c2_1); + assertThat(cd2.patchSet(psId2_2).commitId()).isEqualTo(c2_2); ChangeData cd1 = r1.getChange(); assertThat(cd1.change().isMerged()).isTrue(); PatchSet.Id psId1_2 = cd1.change().currentPatchSetId(); assertThat(psId1_2.get()).isEqualTo(2); - assertThat(cd1.patchSet(psId1_1).getCommitId()).isEqualTo(c1_1); - assertThat(cd1.patchSet(psId1_2).getCommitId()).isEqualTo(c1_2); + assertThat(cd1.patchSet(psId1_1).commitId()).isEqualTo(c1_1); + assertThat(cd1.patchSet(psId1_2).commitId()).isEqualTo(c1_2); } private PatchSetApproval getSubmitter(PatchSet.Id patchSetId) throws Exception { diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java index 88273ee7b8..f40c82f2f3 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java @@ -229,7 +229,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { break; case REBASE_IF_NECESSARY: case REBASE_ALWAYS: - String change2hash = change2.getChange().currentPatchSet().getCommitId().name(); + String change2hash = change2.getChange().currentPatchSet().commitId().name(); assertThat(e.getMessage()) .isEqualTo( "Cannot rebase " diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java index 3106dcb78a..5d5887d2dd 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java @@ -102,8 +102,8 @@ public class SubmitByRebaseAlwaysIT extends AbstractSubmitByRebase { ChangeData cd1 = changes.get(0).getChange(); ChangeData cd2 = changes.get(1).getChange(); assertThat(cd2.patchSets()).hasSize(2); - String change1CurrentCommit = cd1.currentPatchSet().getCommitId().name(); - String change2Ps1Commit = cd2.patchSet(PatchSet.id(cd2.getId(), 1)).getCommitId().name(); + String change1CurrentCommit = cd1.currentPatchSet().commitId().name(); + String change2Ps1Commit = cd2.patchSet(PatchSet.id(cd2.getId(), 1)).commitId().name(); 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 b820f4afc6..b1a2ed0d53 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java @@ -131,7 +131,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { assertProblems( notes, null, - problem("Ref missing: " + ps.getId().toRefName()), + problem("Ref missing: " + ps.id().toRefName()), problem("Object missing: patch set 2: deadbeefdeadbeefdeadbeefdeadbeefdeadbeef")); } @@ -142,7 +142,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { PatchSet ps = insertMissingPatchSet(notes, rev); notes = reload(notes); - String refName = ps.getId().toRefName(); + String refName = ps.id().toRefName(); assertProblems( notes, new FixInput(), @@ -153,7 +153,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void patchSetRefMissing() throws Exception { ChangeNotes notes = insertChange(); - serverSideTestRepo.update("refs/other/foo", psUtil.current(notes).getCommitId()); + serverSideTestRepo.update("refs/other/foo", psUtil.current(notes).commitId()); String refName = notes.getChange().currentPatchSetId().toRefName(); deleteRef(refName); @@ -163,7 +163,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void patchSetRefMissingWithFix() throws Exception { ChangeNotes notes = insertChange(); - ObjectId commitId = psUtil.current(notes).getCommitId(); + ObjectId commitId = psUtil.current(notes).commitId(); serverSideTestRepo.update("refs/other/foo", commitId); String refName = notes.getChange().currentPatchSetId().toRefName(); deleteRef(refName); @@ -188,13 +188,13 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { assertProblems( notes, fix, - problem("Ref missing: " + ps2.getId().toRefName()), + problem("Ref missing: " + ps2.id().toRefName()), problem("Object missing: patch set 2: " + rev2, FIXED, "Deleted patch set")); notes = reload(notes); assertThat(notes.getChange().currentPatchSetId().get()).isEqualTo(1); - assertThat(psUtil.get(notes, ps1.getId())).isNotNull(); - assertThat(psUtil.get(notes, ps2.getId())).isNull(); + assertThat(psUtil.get(notes, ps1.id())).isNotNull(); + assertThat(psUtil.get(notes, ps2.id())).isNull(); } @Test @@ -217,17 +217,17 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { assertProblems( notes, fix, - problem("Ref missing: " + ps2.getId().toRefName()), + problem("Ref missing: " + ps2.id().toRefName()), problem("Object missing: patch set 2: " + rev2, FIXED, "Deleted patch set"), - problem("Ref missing: " + ps4.getId().toRefName()), + problem("Ref missing: " + ps4.id().toRefName()), problem("Object missing: patch set 4: " + rev4, FIXED, "Deleted patch set")); notes = reload(notes); assertThat(notes.getChange().currentPatchSetId().get()).isEqualTo(3); - assertThat(psUtil.get(notes, ps1.getId())).isNotNull(); - assertThat(psUtil.get(notes, ps2.getId())).isNull(); - assertThat(psUtil.get(notes, ps3.getId())).isNotNull(); - assertThat(psUtil.get(notes, ps4.getId())).isNull(); + assertThat(psUtil.get(notes, ps1.id())).isNotNull(); + assertThat(psUtil.get(notes, ps2.id())).isNull(); + assertThat(psUtil.get(notes, ps3.id())).isNotNull(); + assertThat(psUtil.get(notes, ps4.id())).isNull(); } @Test @@ -264,7 +264,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { assertProblems( notes, fix, - problem("Ref missing: " + ps.getId().toRefName()), + problem("Ref missing: " + ps.id().toRefName()), problem( "Object missing: patch set 1: " + rev, FIX_FAILED, @@ -280,13 +280,12 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { ChangeNotes notes = insertChange(); PatchSet ps1 = psUtil.current(notes); - notes = - incrementPatchSet(notes, serverSideTestRepo.getRevWalk().parseCommit(ps1.getCommitId())); + notes = incrementPatchSet(notes, serverSideTestRepo.getRevWalk().parseCommit(ps1.commitId())); assertProblems( notes, null, - problem("Multiple patch sets pointing to " + ps1.getCommitId().name() + ": [1, 2]")); + problem("Multiple patch sets pointing to " + ps1.commitId().name() + ": [1, 2]")); } @Test @@ -328,7 +327,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { null, problem( "Patch set 1 (" - + psUtil.current(notes).getCommitId().name() + + psUtil.current(notes).commitId().name() + ") is not merged into destination ref" + " refs/heads/master (" + tip.name() @@ -338,7 +337,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void newChangeIsMerged() throws Exception { ChangeNotes notes = insertChange(); - ObjectId commitId = psUtil.current(notes).getCommitId(); + ObjectId commitId = psUtil.current(notes).commitId(); serverSideTestRepo .branch(notes.getChange().getDest().branch()) .update(serverSideTestRepo.getRevWalk().parseCommit(commitId)); @@ -358,7 +357,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void newChangeIsMergedWithFix() throws Exception { ChangeNotes notes = insertChange(); - ObjectId commitId = psUtil.current(notes).getCommitId(); + ObjectId commitId = psUtil.current(notes).commitId(); serverSideTestRepo .branch(notes.getChange().getDest().branch()) .update(serverSideTestRepo.getRevWalk().parseCommit(commitId)); @@ -384,7 +383,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void extensionApiReturnsUpdatedValueAfterFix() throws Exception { ChangeNotes notes = insertChange(); - ObjectId commitId = psUtil.current(notes).getCommitId(); + ObjectId commitId = psUtil.current(notes).commitId(); serverSideTestRepo .branch(notes.getChange().getDest().branch()) .update(serverSideTestRepo.getRevWalk().parseCommit(commitId)); @@ -399,7 +398,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void expectedMergedCommitIsLatestPatchSet() throws Exception { ChangeNotes notes = insertChange(); - ObjectId commitId = psUtil.current(notes).getCommitId(); + ObjectId commitId = psUtil.current(notes).commitId(); serverSideTestRepo .branch(notes.getChange().getDest().branch()) .update(serverSideTestRepo.getRevWalk().parseCommit(commitId)); @@ -428,7 +427,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { public void expectedMergedCommitNotMergedIntoDestination() throws Exception { ChangeNotes notes = insertChange(); RevCommit commit = - serverSideTestRepo.getRevWalk().parseCommit(psUtil.current(notes).getCommitId()); + serverSideTestRepo.getRevWalk().parseCommit(psUtil.current(notes).commitId()); serverSideTestRepo.branch(notes.getChange().getDest().branch()).update(commit); FixInput fix = new FixInput(); @@ -451,7 +450,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { ChangeNotes notes = insertChange(); String dest = notes.getChange().getDest().branch(); RevCommit commit = - serverSideTestRepo.getRevWalk().parseCommit(psUtil.current(notes).getCommitId()); + serverSideTestRepo.getRevWalk().parseCommit(psUtil.current(notes).commitId()); RevCommit mergedAs = serverSideTestRepo @@ -482,7 +481,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { notes = reload(notes); PatchSet.Id psId2 = PatchSet.id(notes.getChangeId(), 2); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId2); - assertThat(psUtil.get(notes, psId2).getCommitId()).isEqualTo(mergedAs); + assertThat(psUtil.get(notes, psId2).commitId()).isEqualTo(mergedAs); assertNoProblems(notes, null); } @@ -492,7 +491,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { ChangeNotes notes = insertChange(); String dest = notes.getChange().getDest().branch(); RevCommit commit = - serverSideTestRepo.getRevWalk().parseCommit(psUtil.current(notes).getCommitId()); + serverSideTestRepo.getRevWalk().parseCommit(psUtil.current(notes).commitId()); RevCommit mergedAs = serverSideTestRepo @@ -530,7 +529,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { notes = reload(notes); PatchSet.Id psId2 = PatchSet.id(notes.getChangeId(), 2); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId2); - assertThat(psUtil.get(notes, psId2).getCommitId()).isEqualTo(mergedAs); + assertThat(psUtil.get(notes, psId2).commitId()).isEqualTo(mergedAs); assertNoProblems(notes, null); } @@ -538,7 +537,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void expectedMergedCommitIsOldPatchSetOfSameChange() throws Exception { ChangeNotes notes = insertChange(); - ObjectId commitId1 = psUtil.current(notes).getCommitId(); + ObjectId commitId1 = psUtil.current(notes).commitId(); notes = incrementPatchSet(notes); PatchSet ps2 = psUtil.current(notes); serverSideTestRepo @@ -573,8 +572,8 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { 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); - assertThat(psUtil.get(notes, psId3).getCommitId()).isEqualTo(commitId1); + assertThat(psUtil.byChangeAsMap(notes).keySet()).containsExactly(ps2.id(), psId3); + assertThat(psUtil.get(notes, psId3).commitId()).isEqualTo(commitId1); } @Test @@ -589,7 +588,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { notes = incrementPatchSet(notes); PatchSet ps3 = psUtil.current(notes); - assertThat(ps3.getId().get()).isEqualTo(3); + assertThat(ps3.id().get()).isEqualTo(3); serverSideTestRepo.branch(notes.getChange().getDest().branch()).update(commit2); @@ -621,9 +620,8 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { PatchSet.Id psId4 = PatchSet.id(notes.getChangeId(), 4); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId4); assertThat(notes.getChange().isMerged()).isTrue(); - assertThat(psUtil.byChangeAsMap(notes).keySet()) - .containsExactly(ps1.getId(), ps3.getId(), psId4); - assertThat(psUtil.get(notes, psId4).getCommitId()).isEqualTo(commit2); + assertThat(psUtil.byChangeAsMap(notes).keySet()).containsExactly(ps1.id(), ps3.id(), psId4); + assertThat(psUtil.get(notes, psId4).commitId()).isEqualTo(commit2); } @Test @@ -658,8 +656,8 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { notes = reload(notes); assertThat(notes.getChange().currentPatchSetId()).isEqualTo(psId2); assertThat(notes.getChange().isMerged()).isTrue(); - assertThat(psUtil.byChangeAsMap(notes).keySet()).containsExactly(ps1.getId(), psId2); - assertThat(psUtil.get(notes, psId2).getCommitId()).isEqualTo(commit2); + assertThat(psUtil.byChangeAsMap(notes).keySet()).containsExactly(ps1.id(), psId2); + assertThat(psUtil.get(notes, psId2).commitId()).isEqualTo(commit2); } @Test @@ -668,7 +666,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { String dest = notes.getChange().getDest().branch(); RevCommit parent = serverSideTestRepo.branch(dest).commit().message("parent").create(); RevCommit commit = - serverSideTestRepo.getRevWalk().parseCommit(psUtil.current(notes).getCommitId()); + serverSideTestRepo.getRevWalk().parseCommit(psUtil.current(notes).commitId()); serverSideTestRepo.branch(dest).update(commit); String badId = "I0000000000000000000000000000000000000000"; @@ -701,19 +699,19 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void expectedMergedCommitMatchesMultiplePatchSets() throws Exception { ChangeNotes notes1 = insertChange(); - PatchSet.Id psId1 = psUtil.current(notes1).getId(); + PatchSet.Id psId1 = psUtil.current(notes1).id(); String dest = notes1.getChange().getDest().branch(); RevCommit commit = - serverSideTestRepo.getRevWalk().parseCommit(psUtil.current(notes1).getCommitId()); + serverSideTestRepo.getRevWalk().parseCommit(psUtil.current(notes1).commitId()); serverSideTestRepo.branch(dest).update(commit); ChangeNotes notes2 = insertChange(); notes2 = incrementPatchSet(notes2, commit); - PatchSet.Id psId2 = psUtil.current(notes2).getId(); + PatchSet.Id psId2 = psUtil.current(notes2).id(); ChangeNotes notes3 = insertChange(); notes3 = incrementPatchSet(notes3, commit); - PatchSet.Id psId3 = psUtil.current(notes3).getId(); + PatchSet.Id psId3 = psUtil.current(notes3).id(); FixInput fix = new FixInput(); fix.expectMergedAs = commit.name(); @@ -849,7 +847,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { private ChangeNotes mergeChange(ChangeNotes notes) throws Exception { ObjectId oldId = getDestRef(notes); - ObjectId newId = psUtil.current(notes).getCommitId(); + ObjectId newId = psUtil.current(notes).commitId(); String dest = notes.getChange().getDest().branch(); try (BatchUpdate bu = newUpdate(adminId)) { diff --git a/javatests/com/google/gerrit/reviewdb/converter/PatchSetProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/PatchSetProtoConverterTest.java index 2c21789d57..ffc60686ff 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/PatchSetProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/PatchSetProtoConverterTest.java @@ -171,13 +171,13 @@ public class PatchSetProtoConverterTest { assertThatSerializedClass(PatchSet.class) .hasAutoValueMethods( ImmutableMap.builder() - .put("getId", PatchSet.Id.class) - .put("getCommitId", ObjectId.class) - .put("getUploader", Account.Id.class) - .put("getCreatedOn", Timestamp.class) - .put("getGroups", new TypeLiteral>() {}.getType()) - .put("getPushCertificate", new TypeLiteral>() {}.getType()) - .put("getDescription", new TypeLiteral>() {}.getType()) + .put("id", PatchSet.Id.class) + .put("commitId", ObjectId.class) + .put("uploader", Account.Id.class) + .put("createdOn", Timestamp.class) + .put("groups", new TypeLiteral>() {}.getType()) + .put("pushCertificate", new TypeLiteral>() {}.getType()) + .put("description", new TypeLiteral>() {}.getType()) .build()); } } diff --git a/javatests/com/google/gerrit/server/change/WalkSorterTest.java b/javatests/com/google/gerrit/server/change/WalkSorterTest.java index f8786e4562..4a42140516 100644 --- a/javatests/com/google/gerrit/server/change/WalkSorterTest.java +++ b/javatests/com/google/gerrit/server/change/WalkSorterTest.java @@ -295,8 +295,7 @@ public class WalkSorterTest { List changes = ImmutableList.of(cd1, cd2); WalkSorter sorter = - new WalkSorter(repoManager) - .includePatchSets(ImmutableSet.of(cd1.currentPatchSet().getId())); + new WalkSorter(repoManager).includePatchSets(ImmutableSet.of(cd1.currentPatchSet().id())); assertSorted(sorter, changes, ImmutableList.of(patchSetData(cd1, c1))); } diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java index ddf0db3f55..f543cca2c0 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java @@ -355,9 +355,7 @@ public class ChangeNotesStateTest { assertThat(ps2Bytes).isNotEqualTo(ps1Bytes); assertRoundTrip( - newBuilder() - .patchSets(ImmutableMap.of(ps2.getId(), ps2, ps1.getId(), ps1).entrySet()) - .build(), + newBuilder().patchSets(ImmutableMap.of(ps2.id(), ps2, ps1.id(), ps1).entrySet()).build(), ChangeNotesStateProto.newBuilder() .setMetaId(SHA_BYTES) .setChangeId(ID.get()) @@ -772,13 +770,13 @@ public class ChangeNotesStateTest { assertThatSerializedClass(PatchSet.class) .hasAutoValueMethods( ImmutableMap.builder() - .put("getId", PatchSet.Id.class) - .put("getCommitId", ObjectId.class) - .put("getUploader", Account.Id.class) - .put("getCreatedOn", Timestamp.class) - .put("getGroups", new TypeLiteral>() {}.getType()) - .put("getPushCertificate", new TypeLiteral>() {}.getType()) - .put("getDescription", new TypeLiteral>() {}.getType()) + .put("id", PatchSet.Id.class) + .put("commitId", ObjectId.class) + .put("uploader", Account.Id.class) + .put("createdOn", Timestamp.class) + .put("groups", new TypeLiteral>() {}.getType()) + .put("pushCertificate", new TypeLiteral>() {}.getType()) + .put("description", new TypeLiteral>() {}.getType()) .build()); } diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java index 36bcd101fb..f023565375 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java @@ -102,7 +102,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { update.commit(); ChangeNotes notes = newNotes(c); - assertThat(notes.getCurrentPatchSet().getDescription()).hasValue(description); + assertThat(notes.getCurrentPatchSet().description()).hasValue(description); description = "new, now more descriptive!"; update = newUpdate(c, changeOwner); @@ -110,7 +110,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { update.commit(); notes = newNotes(c); - assertThat(notes.getCurrentPatchSet().getDescription()).hasValue(description); + assertThat(notes.getCurrentPatchSet().description()).hasValue(description); } @Test @@ -1002,7 +1002,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { + " " + commit.name() + " and " - + ps.getCommitId().name()); + + ps.commitId().name()); } @Test @@ -1012,32 +1012,32 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { // ps1 created by newChange() ChangeNotes notes = newNotes(c); PatchSet ps1 = notes.getCurrentPatchSet(); - assertThat(notes.getChange().currentPatchSetId()).isEqualTo(ps1.getId()); + assertThat(notes.getChange().currentPatchSetId()).isEqualTo(ps1.id()); assertThat(notes.getChange().getSubject()).isEqualTo("Change subject"); assertThat(notes.getChange().getOriginalSubject()).isEqualTo("Change subject"); - assertThat(ps1.getId()).isEqualTo(PatchSet.id(c.getId(), 1)); - assertThat(ps1.getUploader()).isEqualTo(changeOwner.getAccountId()); + assertThat(ps1.id()).isEqualTo(PatchSet.id(c.getId(), 1)); + assertThat(ps1.uploader()).isEqualTo(changeOwner.getAccountId()); // ps2 by other user RevCommit commit = incrementPatchSet(c, otherUser); notes = newNotes(c); PatchSet ps2 = notes.getCurrentPatchSet(); - assertThat(ps2.getId()).isEqualTo(PatchSet.id(c.getId(), 2)); + assertThat(ps2.id()).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()); - assertThat(ps2.getCommitId()).isNotEqualTo(ps1.getCommitId()); - assertThat(ps2.getCommitId()).isEqualTo(commit); - assertThat(ps2.getUploader()).isEqualTo(otherUser.getAccountId()); - assertThat(ps2.getCreatedOn()).isEqualTo(notes.getChange().getLastUpdatedOn()); + assertThat(notes.getChange().currentPatchSetId()).isEqualTo(ps2.id()); + assertThat(ps2.commitId()).isNotEqualTo(ps1.commitId()); + assertThat(ps2.commitId()).isEqualTo(commit); + assertThat(ps2.uploader()).isEqualTo(otherUser.getAccountId()); + assertThat(ps2.createdOn()).isEqualTo(notes.getChange().getLastUpdatedOn()); // comment on ps1, current patch set is still ps2 ChangeUpdate update = newUpdate(c, changeOwner); - update.setPatchSetId(ps1.getId()); + update.setPatchSetId(ps1.id()); update.setChangeMessage("Comment on old patch set."); update.commit(); notes = newNotes(c); - assertThat(notes.getChange().currentPatchSetId()).isEqualTo(ps2.getId()); + assertThat(notes.getChange().currentPatchSetId()).isEqualTo(ps2.id()); } @Test @@ -1098,14 +1098,14 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { PatchSet.Id psId1 = c.currentPatchSetId(); ChangeNotes notes = newNotes(c); - assertThat(notes.getPatchSets().get(psId1).getGroups()).isEmpty(); + assertThat(notes.getPatchSets().get(psId1).groups()).isEmpty(); // ps1 ChangeUpdate update = newUpdate(c, changeOwner); update.setGroups(ImmutableList.of("a", "b")); update.commit(); notes = newNotes(c); - assertThat(notes.getPatchSets().get(psId1).getGroups()).containsExactly("a", "b").inOrder(); + assertThat(notes.getPatchSets().get(psId1).groups()).containsExactly("a", "b").inOrder(); incrementCurrentPatchSetFieldOnly(c); PatchSet.Id psId2 = c.currentPatchSetId(); @@ -1114,8 +1114,8 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { update.setGroups(ImmutableList.of("d")); update.commit(); notes = newNotes(c); - assertThat(notes.getPatchSets().get(psId2).getGroups()).containsExactly("d"); - assertThat(notes.getPatchSets().get(psId1).getGroups()).containsExactly("a", "b").inOrder(); + assertThat(notes.getPatchSets().get(psId2).groups()).containsExactly("d"); + assertThat(notes.getPatchSets().get(psId1).groups()).containsExactly("a", "b").inOrder(); } @Test @@ -1144,8 +1144,8 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { readNote(notes, commit); Map patchSets = notes.getPatchSets(); - assertThat(patchSets.get(psId1).getPushCertificate()).isEmpty(); - assertThat(patchSets.get(psId2).getPushCertificate()).hasValue(pushCert); + assertThat(patchSets.get(psId1).pushCertificate()).isEmpty(); + assertThat(patchSets.get(psId2).pushCertificate()).hasValue(pushCert); assertThat(notes.getComments()).isEmpty(); // comment on ps2 @@ -1172,8 +1172,8 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { notes = newNotes(c); patchSets = notes.getPatchSets(); - assertThat(patchSets.get(psId1).getPushCertificate()).isEmpty(); - assertThat(patchSets.get(psId2).getPushCertificate()).hasValue(pushCert); + assertThat(patchSets.get(psId1).pushCertificate()).isEmpty(); + assertThat(patchSets.get(psId2).pushCertificate()).hasValue(pushCert); assertThat(notes.getComments()).isNotEmpty(); } diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 2514b5bf10..3c8d238654 100644 --- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -2489,8 +2489,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { assertThat(indexer.reindexIfStale(project, change.getId()).get()).isFalse(); // Delete edit ref behind index's back. - RefUpdate ru = - repo.getRepository().updateRef(RefNames.refsEdit(user, change.getId(), ps.getId())); + RefUpdate ru = repo.getRepository().updateRef(RefNames.refsEdit(user, change.getId(), ps.id())); ru.setForceUpdate(true); assertThat(ru.delete()).isEqualTo(RefUpdate.Result.FORCED); diff --git a/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java b/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java index d8f735855e..0f7292d5de 100644 --- a/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java +++ b/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java @@ -33,7 +33,7 @@ public class ChangeDataTest { ChangeData cd = ChangeData.createForTest(project, Change.id(1), 1, ObjectId.zeroId()); cd.setChange(TestChanges.newChange(project, Account.id(1000))); PatchSet curr1 = cd.currentPatchSet(); - int currId = curr1.getId().get(); + int currId = curr1.id().get(); PatchSet ps1 = newPatchSet(cd.getId(), currId + 1); PatchSet ps2 = newPatchSet(cd.getId(), currId + 2); cd.setPatchSets(ImmutableList.of(ps1, ps2)); diff --git a/javatests/com/google/gerrit/server/update/BatchUpdateTest.java b/javatests/com/google/gerrit/server/update/BatchUpdateTest.java index 14e101c622..79faf60d2c 100644 --- a/javatests/com/google/gerrit/server/update/BatchUpdateTest.java +++ b/javatests/com/google/gerrit/server/update/BatchUpdateTest.java @@ -250,8 +250,7 @@ public class BatchUpdateTest { ChangeNotes notes = changeNotesFactory.create(project, id); try (BatchUpdate bu = batchUpdateFactory.create(project, user.get(), TimeUtil.nowTs())) { - ObjectId commitId = - repo.amend(notes.getCurrentPatchSet().getCommitId()).message("PS2").create(); + ObjectId commitId = repo.amend(notes.getCurrentPatchSet().commitId()).message("PS2").create(); bu.addOp( id, patchSetInserterFactory diff --git a/plugins/reviewnotes b/plugins/reviewnotes index 3e74dbd716..599e3cfca2 160000 --- a/plugins/reviewnotes +++ b/plugins/reviewnotes @@ -1 +1 @@ -Subproject commit 3e74dbd716f3834f1733c8d5aedec0ce2089d4c6 +Subproject commit 599e3cfca2dc32d3c684bf41c6ab34262f32dddc