From ac3b3d63d130fe2ac845dddb336700cb2fe886f1 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Wed, 17 Apr 2019 15:53:44 -0700 Subject: [PATCH] Convert Branch.NameKey to AutoValue See I6982fb24 for context. Change-Id: I7a79a374c9efdd4ccd9ab5169562fb8ae3452120 --- .../gerrit/acceptance/AbstractDaemonTest.java | 12 ++-- .../gerrit/common/data/SubscribeSection.java | 4 +- .../google/gerrit/reviewdb/client/Branch.java | 56 +++++++-------- .../google/gerrit/reviewdb/client/Change.java | 2 +- .../BranchNameKeyProtoConverter.java | 7 +- .../google/gerrit/server/ApprovalCopier.java | 2 +- .../com/google/gerrit/server/ProjectUtil.java | 7 +- .../server/account/DestinationList.java | 4 +- .../gerrit/server/args4j/ChangeIdHandler.java | 2 +- .../gerrit/server/change/ChangeInserter.java | 8 +-- .../gerrit/server/change/ChangeJson.java | 4 +- .../gerrit/server/change/ChangeTriplet.java | 6 +- .../server/change/ConsistencyChecker.java | 10 +-- .../gerrit/server/change/DeleteChangeOp.java | 2 +- .../server/change/PatchSetInserter.java | 2 +- .../gerrit/server/change/RebaseUtil.java | 4 +- .../gerrit/server/change/RevisionJson.java | 2 +- .../gerrit/server/events/ChangeEvent.java | 2 +- .../gerrit/server/events/EventBroker.java | 2 +- .../gerrit/server/events/EventFactory.java | 6 +- .../google/gerrit/server/events/RefEvent.java | 2 +- .../events/StreamEventsApiListener.java | 2 +- .../google/gerrit/server/git/MergeUtil.java | 4 +- .../gerrit/server/git/MergedByPushOp.java | 4 +- .../git/receive/BranchCommitValidator.java | 2 +- .../server/git/receive/ReceiveCommits.java | 38 +++++----- .../gerrit/server/git/receive/ReplaceOp.java | 2 +- .../git/validators/CommitValidators.java | 16 ++--- .../git/validators/MergeValidators.java | 6 +- .../server/index/change/ChangeField.java | 2 +- .../index/change/ReindexAfterRefUpdate.java | 2 +- .../gerrit/server/mail/send/ChangeEmail.java | 2 +- .../server/mail/send/NotificationEmail.java | 10 +-- .../gerrit/server/notedb/ChangeNotes.java | 2 +- .../server/notedb/ChangeNotesState.java | 4 +- .../server/permissions/DefaultRefFilter.java | 2 +- .../server/permissions/PermissionBackend.java | 8 +-- .../server/permissions/ProjectControl.java | 2 +- .../gerrit/server/project/BranchResource.java | 2 +- .../server/project/CreateRefControl.java | 7 +- .../gerrit/server/project/ProjectState.java | 2 +- .../server/project/RemoveReviewerControl.java | 2 +- .../server/query/change/ChangeData.java | 2 +- .../query/change/ChangeQueryBuilder.java | 2 +- .../query/change/ConflictsPredicate.java | 2 +- .../query/change/EqualsLabelPredicate.java | 2 +- .../query/change/InternalChangeQuery.java | 18 ++--- .../server/query/change/ProjectPredicate.java | 2 +- .../query/change/ProjectPrefixPredicate.java | 2 +- .../server/query/change/RefPredicate.java | 2 +- .../query/change/RegexProjectPredicate.java | 2 +- .../query/change/RegexRefPredicate.java | 2 +- .../server/restapi/change/CherryPick.java | 2 +- .../restapi/change/CherryPickChange.java | 22 +++--- .../restapi/change/CherryPickCommit.java | 2 +- .../restapi/change/CreateMergePatchSet.java | 2 +- .../server/restapi/change/Mergeable.java | 2 +- .../gerrit/server/restapi/change/Move.java | 12 ++-- .../gerrit/server/restapi/change/Rebase.java | 6 +- .../gerrit/server/restapi/change/Revert.java | 2 +- .../gerrit/server/restapi/change/Submit.java | 6 +- .../server/restapi/project/CheckAccess.java | 2 +- .../server/restapi/project/CreateBranch.java | 6 +- .../server/restapi/project/DeleteBranch.java | 4 +- .../server/restapi/project/DeleteRef.java | 2 +- .../gerrit/server/submit/GitModules.java | 8 +-- .../submit/LocalMergeSuperSetComputation.java | 4 +- .../google/gerrit/server/submit/MergeOp.java | 4 +- .../server/submit/MergeOpRepoManager.java | 6 +- .../gerrit/server/submit/SubmitDryRun.java | 4 +- .../gerrit/server/submit/SubmitStrategy.java | 4 +- .../server/submit/SubmitStrategyOp.java | 9 +-- .../gerrit/server/submit/SubmoduleOp.java | 38 +++++----- .../util/git/SubmoduleSectionParser.java | 6 +- .../gerrit/sshd/commands/PatchSetParser.java | 2 +- .../google/gerrit/testing/TestChanges.java | 6 +- java/gerrit/PRED_change_branch_1.java | 2 +- .../acceptance/api/accounts/AccountIT.java | 18 ++--- .../acceptance/api/change/ChangeIT.java | 4 +- .../gerrit/acceptance/api/group/GroupsIT.java | 2 +- .../api/project/CheckProjectIT.java | 10 +-- .../api/project/CommitIncludedInIT.java | 2 +- .../acceptance/api/revision/RevisionIT.java | 26 +++---- .../gerrit/acceptance/git/SubmitOnPushIT.java | 2 +- ...bmoduleSubscriptionsWholeTopicMergeIT.java | 4 +- .../rest/change/AbstractSubmit.java | 4 +- .../rest/change/AbstractSubmitByRebase.java | 2 +- .../rest/change/ChangeIncludedInIT.java | 2 +- .../rest/change/CreateChangeIT.java | 6 +- .../acceptance/rest/change/MoveChangeIT.java | 64 ++++++++--------- .../rest/change/SubmitByCherryPickIT.java | 2 +- .../change/SubmitByMergeIfNecessaryIT.java | 18 ++--- .../rest/change/SubmitByRebaseAlwaysIT.java | 2 +- .../rest/project/CheckMergeabilityIT.java | 7 +- .../rest/project/CreateBranchIT.java | 12 ++-- .../rest/project/DeleteBranchIT.java | 18 ++--- .../acceptance/rest/project/FileBranchIT.java | 4 +- .../server/change/ConsistencyCheckerIT.java | 30 ++++---- .../PermissionBackendConditionIT.java | 12 ++-- .../gerrit/reviewdb/client/BranchTest.java | 10 +-- .../BranchNameKeyProtoConverterTest.java | 20 +++--- .../converter/ChangeProtoConverterTest.java | 36 +++++----- .../server/account/DestinationListTest.java | 2 +- .../notedb/AbstractChangeNotesTest.java | 2 +- .../gerrit/server/notedb/ChangeNotesTest.java | 9 ++- .../notedb/CommitMessageOutputTest.java | 4 +- .../change/AbstractQueryChangesTest.java | 2 +- .../util/git/SubmoduleSectionParserTest.java | 71 ++++++++----------- plugins/delete-project | 2 +- plugins/hooks | 2 +- plugins/replication | 2 +- plugins/reviewnotes | 2 +- plugins/webhooks | 2 +- proto/entities.proto | 4 +- 114 files changed, 436 insertions(+), 451 deletions(-) diff --git a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java index c94a738c66..b201b65cf7 100644 --- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java +++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java @@ -692,8 +692,8 @@ public abstract class AbstractDaemonTest { protected BranchApi createBranch(Branch.NameKey branch) throws Exception { return gApi.projects() - .name(branch.getParentKey().get()) - .branch(branch.get()) + .name(branch.project().get()) + .branch(branch.branch()) .create(new BranchInput()); } @@ -701,7 +701,7 @@ public abstract class AbstractDaemonTest { throws Exception { BranchInput in = new BranchInput(); in.revision = revision; - return gApi.projects().name(branch.getParentKey().get()).branch(branch.get()).create(in); + return gApi.projects().name(branch.project().get()).branch(branch.branch()).create(in); } private static final List RANDOM = @@ -1187,7 +1187,7 @@ public abstract class AbstractDaemonTest { continue; } RevCommit c = localRepo.getRevWalk().parseCommit(r.getObjectId()); - ret.put(new Branch.NameKey(proj, refName), c.getTree().copy()); + ret.put(Branch.nameKey(proj, refName), c.getTree().copy()); } } } @@ -1204,11 +1204,11 @@ public abstract class AbstractDaemonTest { Map refValues = new HashMap<>(); for (Branch.NameKey b : trees.keySet()) { - if (!b.getParentKey().equals(proj)) { + if (!b.project().equals(proj)) { continue; } - Ref r = localRepo.getRepository().exactRef(b.get()); + Ref r = localRepo.getRepository().exactRef(b.branch()); assertThat(r).isNotNull(); RevWalk rw = localRepo.getRevWalk(); RevCommit c = rw.parseCommit(r.getObjectId()); diff --git a/java/com/google/gerrit/common/data/SubscribeSection.java b/java/com/google/gerrit/common/data/SubscribeSection.java index aaf0798428..7761111dc6 100644 --- a/java/com/google/gerrit/common/data/SubscribeSection.java +++ b/java/com/google/gerrit/common/data/SubscribeSection.java @@ -62,12 +62,12 @@ public class SubscribeSection { */ public boolean appliesTo(Branch.NameKey branch) { for (RefSpec r : matchingRefSpecs) { - if (r.matchSource(branch.get())) { + if (r.matchSource(branch.branch())) { return true; } } for (RefSpec r : multiMatchRefSpecs) { - if (r.matchSource(branch.get())) { + if (r.matchSource(branch.branch())) { return true; } } diff --git a/java/com/google/gerrit/reviewdb/client/Branch.java b/java/com/google/gerrit/reviewdb/client/Branch.java index 18ab2cf4e6..48bb4d8c01 100644 --- a/java/com/google/gerrit/reviewdb/client/Branch.java +++ b/java/com/google/gerrit/reviewdb/client/Branch.java @@ -14,48 +14,40 @@ package com.google.gerrit.reviewdb.client; -import com.google.gwtorm.client.StringKey; +import com.google.auto.value.AutoValue; +import com.google.gwtorm.client.StandardKeyEncoder; /** Line of development within a {@link Project}. */ public final class Branch { + public static NameKey nameKey(Project.NameKey projectName, String branchName) { + return new AutoValue_Branch_NameKey(projectName, RefNames.fullName(branchName)); + } + + public static NameKey nameKey(String projectName, String branchName) { + return nameKey(new Project.NameKey(projectName), branchName); + } + /** Branch name key */ - public static class NameKey extends StringKey { - private static final long serialVersionUID = 1L; + @AutoValue + public abstract static class NameKey implements Comparable { + public abstract Project.NameKey project(); - protected Project.NameKey projectName; + public abstract String branch(); - protected String branchName; - - protected NameKey() { - projectName = new Project.NameKey(); - } - - public NameKey(Project.NameKey proj, String branchName) { - projectName = proj; - set(branchName); - } - - public NameKey(String proj, String branchName) { - this(new Project.NameKey(proj), branchName); + public String shortName() { + return RefNames.shortName(branch()); } @Override - public String get() { - return branchName; + public int compareTo(NameKey o) { + // TODO(dborowitz): Only compares branch name in order to match old StringKey behavior. + // Consider comparing project name first. + return branch().compareTo(o.branch()); } @Override - protected void set(String newValue) { - branchName = RefNames.fullName(newValue); - } - - @Override - public Project.NameKey getParentKey() { - return projectName; - } - - public String getShortName() { - return RefNames.shortName(get()); + public String toString() { + return project() + "," + new StandardKeyEncoder().encode(branch()); } } @@ -74,11 +66,11 @@ public final class Branch { } public String getName() { - return name.get(); + return name.branch(); } public String getShortName() { - return name.getShortName(); + return name.shortName(); } public RevId getRevision() { diff --git a/java/com/google/gerrit/reviewdb/client/Change.java b/java/com/google/gerrit/reviewdb/client/Change.java index c1443f2ef2..329686c398 100644 --- a/java/com/google/gerrit/reviewdb/client/Change.java +++ b/java/com/google/gerrit/reviewdb/client/Change.java @@ -600,7 +600,7 @@ public final class Change { } public Project.NameKey getProject() { - return dest.getParentKey(); + return dest.project(); } public String getSubject() { diff --git a/java/com/google/gerrit/reviewdb/converter/BranchNameKeyProtoConverter.java b/java/com/google/gerrit/reviewdb/converter/BranchNameKeyProtoConverter.java index 4558f9bae9..e04945ceb7 100644 --- a/java/com/google/gerrit/reviewdb/converter/BranchNameKeyProtoConverter.java +++ b/java/com/google/gerrit/reviewdb/converter/BranchNameKeyProtoConverter.java @@ -29,15 +29,14 @@ public enum BranchNameKeyProtoConverter @Override public Entities.Branch_NameKey toProto(Branch.NameKey nameKey) { return Entities.Branch_NameKey.newBuilder() - .setProjectName(projectNameConverter.toProto(nameKey.getParentKey())) - .setBranchName(nameKey.get()) + .setProject(projectNameConverter.toProto(nameKey.project())) + .setBranch(nameKey.branch()) .build(); } @Override public Branch.NameKey fromProto(Entities.Branch_NameKey proto) { - return new Branch.NameKey( - projectNameConverter.fromProto(proto.getProjectName()), proto.getBranchName()); + return Branch.nameKey(projectNameConverter.fromProto(proto.getProject()), proto.getBranch()); } @Override diff --git a/java/com/google/gerrit/server/ApprovalCopier.java b/java/com/google/gerrit/server/ApprovalCopier.java index 6787859e6f..f975f5c7eb 100644 --- a/java/com/google/gerrit/server/ApprovalCopier.java +++ b/java/com/google/gerrit/server/ApprovalCopier.java @@ -99,7 +99,7 @@ public class ApprovalCopier { requireNonNull(ps, "ps should not be null"); ChangeData cd = changeDataFactory.create(notes); try { - ProjectState project = projectCache.checkedGet(cd.change().getDest().getParentKey()); + ProjectState project = projectCache.checkedGet(cd.change().getDest().project()); ListMultimap all = cd.approvals(); requireNonNull(all, "all should not be null"); diff --git a/java/com/google/gerrit/server/ProjectUtil.java b/java/com/google/gerrit/server/ProjectUtil.java index 1db4aa3a6f..e816b38b22 100644 --- a/java/com/google/gerrit/server/ProjectUtil.java +++ b/java/com/google/gerrit/server/ProjectUtil.java @@ -35,11 +35,12 @@ public class ProjectUtil { */ public static boolean branchExists(final GitRepositoryManager repoManager, Branch.NameKey branch) throws RepositoryNotFoundException, IOException { - try (Repository repo = repoManager.openRepository(branch.getParentKey())) { - boolean exists = repo.getRefDatabase().exactRef(branch.get()) != null; + try (Repository repo = repoManager.openRepository(branch.project())) { + boolean exists = repo.getRefDatabase().exactRef(branch.branch()) != null; if (!exists) { exists = - repo.getFullBranch().equals(branch.get()) || RefNames.REFS_CONFIG.equals(branch.get()); + repo.getFullBranch().equals(branch.branch()) + || RefNames.REFS_CONFIG.equals(branch.branch()); } return exists; } diff --git a/java/com/google/gerrit/server/account/DestinationList.java b/java/com/google/gerrit/server/account/DestinationList.java index 04e710a755..b5cda2f29a 100644 --- a/java/com/google/gerrit/server/account/DestinationList.java +++ b/java/com/google/gerrit/server/account/DestinationList.java @@ -46,7 +46,7 @@ public class DestinationList extends TabFile { } List rows = Lists.newArrayListWithCapacity(dests.size()); for (Branch.NameKey dest : sort(dests)) { - rows.add(new Row(dest.get(), dest.getParentKey().get())); + rows.add(new Row(dest.branch(), dest.project().get())); } return asText("Ref", "Project", rows); } @@ -54,7 +54,7 @@ public class DestinationList extends TabFile { private static Set toSet(List destRows) { Set dests = Sets.newHashSetWithExpectedSize(destRows.size()); for (Row row : destRows) { - dests.add(new Branch.NameKey(new Project.NameKey(row.right), row.left)); + dests.add(Branch.nameKey(new Project.NameKey(row.right), row.left)); } return dests; } diff --git a/java/com/google/gerrit/server/args4j/ChangeIdHandler.java b/java/com/google/gerrit/server/args4j/ChangeIdHandler.java index 77f0fd8cc7..aae37aab5a 100644 --- a/java/com/google/gerrit/server/args4j/ChangeIdHandler.java +++ b/java/com/google/gerrit/server/args4j/ChangeIdHandler.java @@ -60,7 +60,7 @@ public class ChangeIdHandler extends OptionHandler { try { final Change.Key key = Change.Key.parse(tokens.get(2)); final Project.NameKey project = new Project.NameKey(tokens.get(0)); - final Branch.NameKey branch = new Branch.NameKey(project, tokens.get(1)); + final Branch.NameKey branch = Branch.nameKey(project, tokens.get(1)); for (ChangeData cd : queryProvider.get().byBranchKey(branch, key)) { setter.addValue(cd.getId()); return 1; diff --git a/java/com/google/gerrit/server/change/ChangeInserter.java b/java/com/google/gerrit/server/change/ChangeInserter.java index 9f9ec1f04a..6bb182dfa6 100644 --- a/java/com/google/gerrit/server/change/ChangeInserter.java +++ b/java/com/google/gerrit/server/change/ChangeInserter.java @@ -185,7 +185,7 @@ public class ChangeInserter implements InsertChangeOp { getChangeKey(ctx.getRevWalk(), commitId), changeId, ctx.getAccountId(), - new Branch.NameKey(ctx.getProject(), refName), + Branch.nameKey(ctx.getProject(), refName), ctx.getWhen()); change.setStatus(MoreObjects.firstNonNull(status, Change.Status.NEW)); change.setTopic(topic); @@ -377,7 +377,7 @@ public class ChangeInserter implements InsertChangeOp { ChangeUpdate update = ctx.getUpdate(psId); update.setChangeId(change.getKey().get()); update.setSubjectForCommit("Create change"); - update.setBranch(change.getDest().get()); + update.setBranch(change.getDest().branch()); update.setTopic(change.getTopic()); update.setPsDescription(patchSetDescription); update.setPrivate(isPrivate); @@ -518,14 +518,14 @@ public class ChangeInserter implements InsertChangeOp { new CommitReceivedEvent( cmd, projectState.getProject(), - change.getDest().get(), + change.getDest().branch(), ctx.getRevWalk().getObjectReader(), commitId, ctx.getIdentifiedUser())) { commitValidatorsFactory .forGerritCommits( permissionBackend.user(ctx.getUser()).project(ctx.getProject()), - new Branch.NameKey(ctx.getProject(), refName), + Branch.nameKey(ctx.getProject(), refName), ctx.getIdentifiedUser(), new NoSshInfo(), ctx.getRevWalk(), diff --git a/java/com/google/gerrit/server/change/ChangeJson.java b/java/com/google/gerrit/server/change/ChangeJson.java index a164853be9..0cc2f619f8 100644 --- a/java/com/google/gerrit/server/change/ChangeJson.java +++ b/java/com/google/gerrit/server/change/ChangeJson.java @@ -451,7 +451,7 @@ public class ChangeJson { Change c = result.change(); if (c != null) { info.project = c.getProject().get(); - info.branch = c.getDest().getShortName(); + info.branch = c.getDest().shortName(); info.topic = c.getTopic(); info.changeId = c.getKey().get(); info.subject = c.getSubject(); @@ -499,7 +499,7 @@ public class ChangeJson { Change in = cd.change(); out.project = in.getProject().get(); - out.branch = in.getDest().getShortName(); + out.branch = in.getDest().shortName(); out.topic = in.getTopic(); out.assignee = in.getAssignee() != null ? accountLoader.get(in.getAssignee()) : null; out.hashtags = cd.hashtags(); diff --git a/java/com/google/gerrit/server/change/ChangeTriplet.java b/java/com/google/gerrit/server/change/ChangeTriplet.java index 2daeb7c9fe..d15a95fc9a 100644 --- a/java/com/google/gerrit/server/change/ChangeTriplet.java +++ b/java/com/google/gerrit/server/change/ChangeTriplet.java @@ -28,7 +28,7 @@ public abstract class ChangeTriplet { } private static String format(Branch.NameKey branch, Change.Key change) { - return branch.getParentKey().get() + "~" + branch.getShortName() + "~" + change.get(); + return branch.project().get() + "~" + branch.shortName() + "~" + change.get(); } /** @@ -53,11 +53,11 @@ public abstract class ChangeTriplet { String changeId = Url.decode(triplet.substring(z + 1)); return Optional.of( new AutoValue_ChangeTriplet( - new Branch.NameKey(new Project.NameKey(project), branch), new Change.Key(changeId))); + Branch.nameKey(new Project.NameKey(project), branch), new Change.Key(changeId))); } public final Project.NameKey project() { - return branch().getParentKey(); + return branch().project(); } public abstract Branch.NameKey branch(); diff --git a/java/com/google/gerrit/server/change/ConsistencyChecker.java b/java/com/google/gerrit/server/change/ConsistencyChecker.java index 80b7190df7..938ea15e63 100644 --- a/java/com/google/gerrit/server/change/ConsistencyChecker.java +++ b/java/com/google/gerrit/server/change/ConsistencyChecker.java @@ -238,7 +238,7 @@ public class ConsistencyChecker { } private boolean openRepo() { - Project.NameKey project = change().getDest().getParentKey(); + Project.NameKey project = change().getDest().project(); try { repo = repoManager.openRepository(project); oi = repo.newObjectInserter(); @@ -327,7 +327,7 @@ public class ConsistencyChecker { } private void checkMerged() { - String refName = change().getDest().get(); + String refName = change().getDest().branch(); Ref dest; try { dest = repo.getRefDatabase().exactRef(refName); @@ -359,7 +359,7 @@ public class ConsistencyChecker { } private ProblemInfo wrongChangeStatus(PatchSet.Id psId, RevCommit commit) { - String refName = change().getDest().get(); + String refName = change().getDest().branch(); return problem( formatProblemMessage( "Patch set %d (%s) is merged into destination ref %s (%s), but change" @@ -368,7 +368,7 @@ public class ConsistencyChecker { } private void checkMergedBitMatchesStatus(PatchSet.Id psId, RevCommit commit, boolean merged) { - String refName = change().getDest().get(); + String refName = change().getDest().branch(); if (merged && !change().isMerged()) { ProblemInfo p = wrongChangeStatus(psId, commit); if (fix != null) { @@ -406,7 +406,7 @@ public class ConsistencyChecker { problem( String.format( "Expected merged commit %s is not merged into destination ref %s (%s)", - commit.name(), change().getDest().get(), tip.name())); + commit.name(), change().getDest().branch(), tip.name())); return; } diff --git a/java/com/google/gerrit/server/change/DeleteChangeOp.java b/java/com/google/gerrit/server/change/DeleteChangeOp.java index 63baab7a96..ad687dec0f 100644 --- a/java/com/google/gerrit/server/change/DeleteChangeOp.java +++ b/java/com/google/gerrit/server/change/DeleteChangeOp.java @@ -93,7 +93,7 @@ public class DeleteChangeOp implements BatchUpdateOp { } private boolean isPatchSetMerged(ChangeContext ctx, PatchSet patchSet) throws IOException { - Optional destId = ctx.getRepoView().getRef(ctx.getChange().getDest().get()); + Optional destId = ctx.getRepoView().getRef(ctx.getChange().getDest().branch()); if (!destId.isPresent()) { return false; } diff --git a/java/com/google/gerrit/server/change/PatchSetInserter.java b/java/com/google/gerrit/server/change/PatchSetInserter.java index d3649f660d..11dc4e3aa6 100644 --- a/java/com/google/gerrit/server/change/PatchSetInserter.java +++ b/java/com/google/gerrit/server/change/PatchSetInserter.java @@ -288,7 +288,7 @@ public class PatchSetInserter implements BatchUpdateOp { commitId, refName.substring(0, refName.lastIndexOf('/') + 1) + "new"), projectCache.checkedGet(origNotes.getProjectName()).getProject(), - origNotes.getChange().getDest().get(), + origNotes.getChange().getDest().branch(), ctx.getRevWalk().getObjectReader(), commitId, ctx.getIdentifiedUser())) { diff --git a/java/com/google/gerrit/server/change/RebaseUtil.java b/java/com/google/gerrit/server/change/RebaseUtil.java index a4cf5ba5d5..bd65d34638 100644 --- a/java/com/google/gerrit/server/change/RebaseUtil.java +++ b/java/com/google/gerrit/server/change/RebaseUtil.java @@ -181,10 +181,10 @@ public class RebaseUtil { if (baseRev == null) { // We are dependent on a merged PatchSet or have no PatchSet // dependencies at all. - Ref destRef = git.getRefDatabase().exactRef(destBranch.get()); + Ref destRef = git.getRefDatabase().exactRef(destBranch.branch()); if (destRef == null) { throw new UnprocessableEntityException( - "The destination branch does not exist: " + destBranch.get()); + "The destination branch does not exist: " + destBranch.branch()); } baseRev = destRef.getObjectId().getName(); if (baseRev.equals(parentRev.get())) { diff --git a/java/com/google/gerrit/server/change/RevisionJson.java b/java/com/google/gerrit/server/change/RevisionJson.java index aa733cdfe3..e94d12301e 100644 --- a/java/com/google/gerrit/server/change/RevisionJson.java +++ b/java/com/google/gerrit/server/change/RevisionJson.java @@ -297,7 +297,7 @@ public class RevisionJson { out.commit = getCommitInfo(project, rw, commit, has(WEB_LINKS), fillCommit); } if (addFooters) { - Ref ref = repo.exactRef(cd.change().getDest().get()); + Ref ref = repo.exactRef(cd.change().getDest().branch()); RevCommit mergeTip = null; if (ref != null) { mergeTip = rw.parseCommit(ref.getObjectId()); diff --git a/java/com/google/gerrit/server/events/ChangeEvent.java b/java/com/google/gerrit/server/events/ChangeEvent.java index 6029dedc0d..95fdd7789e 100644 --- a/java/com/google/gerrit/server/events/ChangeEvent.java +++ b/java/com/google/gerrit/server/events/ChangeEvent.java @@ -29,7 +29,7 @@ public abstract class ChangeEvent extends RefEvent { protected ChangeEvent(String type, Change change) { super(type); this.project = change.getProject(); - this.refName = RefNames.fullName(change.getDest().get()); + this.refName = RefNames.fullName(change.getDest().branch()); this.changeKey = change.getKey(); } diff --git a/java/com/google/gerrit/server/events/EventBroker.java b/java/com/google/gerrit/server/events/EventBroker.java index d5f548ff4b..8eb3849d5a 100644 --- a/java/com/google/gerrit/server/events/EventBroker.java +++ b/java/com/google/gerrit/server/events/EventBroker.java @@ -176,7 +176,7 @@ public class EventBroker implements EventDispatcher { protected boolean isVisibleTo(Branch.NameKey branchName, CurrentUser user) throws PermissionBackendException { - ProjectState pe = projectCache.get(branchName.getParentKey()); + ProjectState pe = projectCache.get(branchName.project()); if (pe == null || !pe.statePermitsRead()) { return false; } diff --git a/java/com/google/gerrit/server/events/EventFactory.java b/java/com/google/gerrit/server/events/EventFactory.java index efd9bb9cea..e46493c84b 100644 --- a/java/com/google/gerrit/server/events/EventFactory.java +++ b/java/com/google/gerrit/server/events/EventFactory.java @@ -127,7 +127,7 @@ public class EventFactory { public ChangeAttribute asChangeAttribute(Change change) { ChangeAttribute a = new ChangeAttribute(); a.project = change.getProject().get(); - a.branch = change.getDest().getShortName(); + a.branch = change.getDest().shortName(); a.topic = change.getTopic(); a.id = change.getKey().get(); a.number = change.getId().get(); @@ -178,8 +178,8 @@ public class EventFactory { RefUpdateAttribute ru = new RefUpdateAttribute(); ru.newRev = newId != null ? newId.getName() : ObjectId.zeroId().getName(); ru.oldRev = oldId != null ? oldId.getName() : ObjectId.zeroId().getName(); - ru.project = refName.getParentKey().get(); - ru.refName = refName.get(); + ru.project = refName.project().get(); + ru.refName = refName.branch(); return ru; } diff --git a/java/com/google/gerrit/server/events/RefEvent.java b/java/com/google/gerrit/server/events/RefEvent.java index 951940f0ec..3b7c306d8e 100644 --- a/java/com/google/gerrit/server/events/RefEvent.java +++ b/java/com/google/gerrit/server/events/RefEvent.java @@ -22,7 +22,7 @@ public abstract class RefEvent extends ProjectEvent { } public Branch.NameKey getBranchNameKey() { - return new Branch.NameKey(getProjectNameKey(), getRefName()); + return Branch.nameKey(getProjectNameKey(), getRefName()); } public abstract String getRefName(); diff --git a/java/com/google/gerrit/server/events/StreamEventsApiListener.java b/java/com/google/gerrit/server/events/StreamEventsApiListener.java index 5b7d9b10a7..bc47b78339 100644 --- a/java/com/google/gerrit/server/events/StreamEventsApiListener.java +++ b/java/com/google/gerrit/server/events/StreamEventsApiListener.java @@ -360,7 +360,7 @@ public class StreamEventsApiListener if (ev.getUpdater() != null) { event.submitter = accountAttributeSupplier(ev.getUpdater()); } - final Branch.NameKey refName = new Branch.NameKey(ev.getProjectName(), ev.getRefName()); + final Branch.NameKey refName = Branch.nameKey(ev.getProjectName(), ev.getRefName()); event.refUpdate = Suppliers.memoize( () -> diff --git a/java/com/google/gerrit/server/git/MergeUtil.java b/java/com/google/gerrit/server/git/MergeUtil.java index 5e2ad47a7c..41048f65d4 100644 --- a/java/com/google/gerrit/server/git/MergeUtil.java +++ b/java/com/google/gerrit/server/git/MergeUtil.java @@ -805,9 +805,9 @@ public class MergeUtil { } StringBuilder msgbuf = new StringBuilder().append(summarize(rw, merged)); - if (!R_HEADS_MASTER.equals(destBranch.get())) { + if (!R_HEADS_MASTER.equals(destBranch.branch())) { msgbuf.append(" into "); - msgbuf.append(destBranch.getShortName()); + msgbuf.append(destBranch.shortName()); } if (merged.size() > 1) { diff --git a/java/com/google/gerrit/server/git/MergedByPushOp.java b/java/com/google/gerrit/server/git/MergedByPushOp.java index 43dc061bfe..37814260c3 100644 --- a/java/com/google/gerrit/server/git/MergedByPushOp.java +++ b/java/com/google/gerrit/server/git/MergedByPushOp.java @@ -106,7 +106,7 @@ public class MergedByPushOp implements BatchUpdateOp { @Override public boolean updateChange(ChangeContext ctx) throws IOException { change = ctx.getChange(); - correctBranch = refName.equals(change.getDest().get()); + correctBranch = refName.equals(change.getDest().branch()); if (!correctBranch) { return false; } @@ -135,7 +135,7 @@ public class MergedByPushOp implements BatchUpdateOp { update.setCurrentPatchSet(); StringBuilder msgBuf = new StringBuilder(); msgBuf.append("Change has been successfully pushed"); - if (!refName.equals(change.getDest().get())) { + if (!refName.equals(change.getDest().branch())) { msgBuf.append(" into "); if (refName.startsWith(Constants.R_HEADS)) { msgBuf.append("branch "); diff --git a/java/com/google/gerrit/server/git/receive/BranchCommitValidator.java b/java/com/google/gerrit/server/git/receive/BranchCommitValidator.java index 64f54d6b79..ed13e24e35 100644 --- a/java/com/google/gerrit/server/git/receive/BranchCommitValidator.java +++ b/java/com/google/gerrit/server/git/receive/BranchCommitValidator.java @@ -91,7 +91,7 @@ public class BranchCommitValidator { @Nullable Change change) throws IOException { try (CommitReceivedEvent receiveEvent = - new CommitReceivedEvent(cmd, project, branch.get(), objectReader, commit, user)) { + new CommitReceivedEvent(cmd, project, branch.branch(), objectReader, commit, user)) { CommitValidators validators; if (isMerged) { validators = diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index 6ffad7bfff..8541eef246 100644 --- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java @@ -676,7 +676,7 @@ class ReceiveCommits { Task closeProgress = progress.beginSubTask("closed", UNKNOWN); autoCloseChanges(c, closeProgress); closeProgress.end(); - branches.add(new Branch.NameKey(project.getNameKey(), c.getRefName())); + branches.add(Branch.nameKey(project.getNameKey(), c.getRefName())); break; case DELETE: @@ -1226,7 +1226,7 @@ class ReceiveCommits { return; } - Branch.NameKey branch = new Branch.NameKey(project.getName(), cmd.getRefName()); + Branch.NameKey branch = Branch.nameKey(project.getName(), cmd.getRefName()); try { // Must pass explicit user instead of injecting a provider into CreateRefControl, since // Provider within ReceiveCommits will always return anonymous. @@ -1240,7 +1240,7 @@ class ReceiveCommits { } if (validRefOperation(cmd)) { - validateRegularPushCommits(new Branch.NameKey(project.getNameKey(), cmd.getRefName()), cmd); + validateRegularPushCommits(Branch.nameKey(project.getNameKey(), cmd.getRefName()), cmd); } } @@ -1253,7 +1253,7 @@ class ReceiveCommits { return; } if (validRefOperation(cmd)) { - validateRegularPushCommits(new Branch.NameKey(project.getNameKey(), cmd.getRefName()), cmd); + validateRegularPushCommits(Branch.nameKey(project.getNameKey(), cmd.getRefName()), cmd); } } else { rejectProhibited(cmd, err.get()); @@ -1312,7 +1312,7 @@ class ReceiveCommits { logger.atFine().log("Rewinding %s", cmd); if (newObject != null) { - validateRegularPushCommits(new Branch.NameKey(project.getNameKey(), cmd.getRefName()), cmd); + validateRegularPushCommits(Branch.nameKey(project.getNameKey(), cmd.getRefName()), cmd); if (cmd.getResult() != NOT_ATTEMPTED) { return; } @@ -1705,7 +1705,7 @@ class ReceiveCommits { return; } - magicBranch.dest = new Branch.NameKey(project.getNameKey(), ref); + magicBranch.dest = Branch.nameKey(project.getNameKey(), ref); magicBranch.perm = permissions.ref(ref); Optional err = checkRefPermission(magicBranch.perm, RefPermission.CREATE_CHANGE); @@ -1768,7 +1768,7 @@ class ReceiveCommits { return; } - String destBranch = magicBranch.dest.get(); + String destBranch = magicBranch.dest.branch(); try { if (magicBranch.merged) { if (magicBranch.base != null) { @@ -1777,7 +1777,7 @@ class ReceiveCommits { } RevCommit branchTip = readBranchTip(magicBranch.dest); if (branchTip == null) { - reject(cmd, magicBranch.dest.get() + " not found"); + reject(cmd, magicBranch.dest.branch() + " not found"); return; } if (!walk.isMergedInto(tip, branchTip)) { @@ -1827,7 +1827,7 @@ class ReceiveCommits { // branch does not exist yet. This allows to push initial code for review to an empty // repository and to review an initial project configuration. if (!ref.equals(readHEAD(repo)) && !ref.equals(RefNames.REFS_CONFIG)) { - reject(cmd, magicBranch.dest.get() + " not found"); + reject(cmd, magicBranch.dest.branch() + " not found"); return; } } @@ -1859,7 +1859,7 @@ class ReceiveCommits { private boolean validateConnected(ReceiveCommand cmd, Branch.NameKey dest, RevCommit tip) { RevWalk walk = receivePack.getRevWalk(); try { - Ref targetRef = receivePack.getAdvertisedRefs().get(dest.get()); + Ref targetRef = receivePack.getAdvertisedRefs().get(dest.branch()); if (targetRef == null || targetRef.getObjectId() == null) { // The destination branch does not yet exist. Assume the // history being sent for review will start it and thus @@ -1906,7 +1906,7 @@ class ReceiveCommits { } private RevCommit readBranchTip(Branch.NameKey branch) throws IOException { - Ref r = allRefs().get(branch.get()); + Ref r = allRefs().get(branch.branch()); if (r == null) { return null; } @@ -2141,7 +2141,7 @@ class ReceiveCommits { } if (idList.isEmpty()) { - newChanges.add(new CreateRequest(c, magicBranch.dest.get(), newProgress)); + newChanges.add(new CreateRequest(c, magicBranch.dest.branch(), newProgress)); continue; } } @@ -2225,7 +2225,7 @@ class ReceiveCommits { } newChangeIds.add(p.changeKey); } - newChanges.add(new CreateRequest(p.commit, magicBranch.dest.get(), newProgress)); + newChanges.add(new CreateRequest(p.commit, magicBranch.dest.branch(), newProgress)); } logger.atFine().log( "Finished deferred lookups with %d updates and %d new changes", @@ -2306,7 +2306,7 @@ class ReceiveCommits { rw.markUninteresting(c); } } else { - markHeadsAsUninteresting(rw, magicBranch.dest != null ? magicBranch.dest.get() : null); + markHeadsAsUninteresting(rw, magicBranch.dest != null ? magicBranch.dest.branch() : null); } return start; } @@ -2316,11 +2316,11 @@ class ReceiveCommits { for (RevCommit c : magicBranch.baseCommit) { receivePack.getRevWalk().markUninteresting(c); } - Ref targetRef = allRefs().get(magicBranch.dest.get()); + Ref targetRef = allRefs().get(magicBranch.dest.branch()); if (targetRef != null) { logger.atFine().log( "Marking target ref %s (%s) uninteresting", - magicBranch.dest.get(), targetRef.getObjectId().name()); + magicBranch.dest.branch(), targetRef.getObjectId().name()); receivePack .getRevWalk() .markUninteresting(receivePack.getRevWalk().parseCommit(targetRef.getObjectId())); @@ -2329,7 +2329,7 @@ class ReceiveCommits { private void rejectImplicitMerges(Set mergedParents) throws IOException { if (!mergedParents.isEmpty()) { - Ref targetRef = allRefs().get(magicBranch.dest.get()); + Ref targetRef = allRefs().get(magicBranch.dest.branch()); if (targetRef != null) { RevWalk rw = receivePack.getRevWalk(); RevCommit tip = rw.parseCommit(targetRef.getObjectId()); @@ -3074,7 +3074,7 @@ class ReceiveCommits { } Optional err = - checkRefPermission(permissions.ref(branch.get()), RefPermission.SKIP_VALIDATION); + checkRefPermission(permissions.ref(branch.branch()), RefPermission.SKIP_VALIDATION); if (err.isPresent()) { rejectProhibited(cmd, err.get()); return; @@ -3144,7 +3144,7 @@ class ReceiveCommits { // TODO(dborowitz): Teach BatchUpdate to ignore missing changes. RevCommit newTip = rw.parseCommit(cmd.getNewId()); - Branch.NameKey branch = new Branch.NameKey(project.getNameKey(), refName); + Branch.NameKey branch = Branch.nameKey(project.getNameKey(), refName); rw.reset(); rw.markStart(newTip); diff --git a/java/com/google/gerrit/server/git/receive/ReplaceOp.java b/java/com/google/gerrit/server/git/receive/ReplaceOp.java index b15035a17a..b584d8bc88 100644 --- a/java/com/google/gerrit/server/git/receive/ReplaceOp.java +++ b/java/com/google/gerrit/server/git/receive/ReplaceOp.java @@ -228,7 +228,7 @@ public class ReplaceOp implements BatchUpdateOp { commitId); if (checkMergedInto) { - String mergedInto = findMergedInto(ctx, dest.get(), commit); + String mergedInto = findMergedInto(ctx, dest.branch(), commit); if (mergedInto != null) { mergedByPushOp = mergedByPushOpFactory.create(requestScopePropagator, patchSetId, mergedInto); diff --git a/java/com/google/gerrit/server/git/validators/CommitValidators.java b/java/com/google/gerrit/server/git/validators/CommitValidators.java index d42fbcf9f1..a685cb7648 100644 --- a/java/com/google/gerrit/server/git/validators/CommitValidators.java +++ b/java/com/google/gerrit/server/git/validators/CommitValidators.java @@ -134,8 +134,8 @@ public class CommitValidators { RevWalk rw, @Nullable Change change) throws IOException { - PermissionBackend.ForRef perm = forProject.ref(branch.get()); - ProjectState projectState = projectCache.checkedGet(branch.getParentKey()); + PermissionBackend.ForRef perm = forProject.ref(branch.branch()); + ProjectState projectState = projectCache.checkedGet(branch.project()); return new CommitValidators( ImmutableList.of( new UploadMergesPermissionValidator(perm), @@ -167,15 +167,15 @@ public class CommitValidators { RevWalk rw, @Nullable Change change) throws IOException { - PermissionBackend.ForRef perm = forProject.ref(branch.get()); - ProjectState projectState = projectCache.checkedGet(branch.getParentKey()); + PermissionBackend.ForRef perm = forProject.ref(branch.branch()); + ProjectState projectState = projectCache.checkedGet(branch.project()); return new CommitValidators( ImmutableList.of( new UploadMergesPermissionValidator(perm), new ProjectStateValidationListener(projectState), new AmendedGerritMergeCommitValidationListener(perm, gerritIdent), new AuthorUploaderValidator(user, perm, urlFormatter.get()), - new SignedOffByValidator(user, perm, projectCache.checkedGet(branch.getParentKey())), + new SignedOffByValidator(user, perm, projectCache.checkedGet(branch.project())), new ChangeIdValidator( projectState, user, @@ -206,11 +206,11 @@ public class CommitValidators { // discuss what to do about it. // - Plugin validators may do things like require certain commit message // formats, so we play it safe and exclude them. - PermissionBackend.ForRef perm = forProject.ref(branch.get()); + PermissionBackend.ForRef perm = forProject.ref(branch.branch()); return new CommitValidators( ImmutableList.of( new UploadMergesPermissionValidator(perm), - new ProjectStateValidationListener(projectCache.checkedGet(branch.getParentKey())), + new ProjectStateValidationListener(projectCache.checkedGet(branch.project())), new AuthorUploaderValidator(user, perm, urlFormatter.get()), new CommitterUploaderValidator(user, perm, urlFormatter.get()))); } @@ -413,7 +413,7 @@ public class CommitValidators { @Override public List onCommitReceived(CommitReceivedEvent receiveEvent) throws CommitValidationException { - if (REFS_CONFIG.equals(branch.get())) { + if (REFS_CONFIG.equals(branch.branch())) { List messages = new ArrayList<>(); try { diff --git a/java/com/google/gerrit/server/git/validators/MergeValidators.java b/java/com/google/gerrit/server/git/validators/MergeValidators.java index e7e021b8a4..a8701cb2f0 100644 --- a/java/com/google/gerrit/server/git/validators/MergeValidators.java +++ b/java/com/google/gerrit/server/git/validators/MergeValidators.java @@ -160,7 +160,7 @@ public class MergeValidators { final PatchSet.Id patchSetId, IdentifiedUser caller) throws MergeValidationException { - if (RefNames.REFS_CONFIG.equals(destBranch.get())) { + if (RefNames.REFS_CONFIG.equals(destBranch.branch())) { final Project.NameKey newParent; try { ProjectConfig cfg = projectConfigFactory.create(destProject.getNameKey()); @@ -289,7 +289,7 @@ public class MergeValidators { PatchSet.Id patchSetId, IdentifiedUser caller) throws MergeValidationException { - Account.Id accountId = Account.Id.fromRef(destBranch.get()); + Account.Id accountId = Account.Id.fromRef(destBranch.branch()); if (!allUsersName.equals(destProject.getNameKey()) || accountId == null) { return; } @@ -342,7 +342,7 @@ public class MergeValidators { throws MergeValidationException { // Groups are stored inside the 'All-Users' repository. if (!allUsersName.equals(destProject.getNameKey()) - || !RefNames.isGroupRef(destBranch.get())) { + || !RefNames.isGroupRef(destBranch.branch())) { return; } diff --git a/java/com/google/gerrit/server/index/change/ChangeField.java b/java/com/google/gerrit/server/index/change/ChangeField.java index 0592b57004..2770c1fe63 100644 --- a/java/com/google/gerrit/server/index/change/ChangeField.java +++ b/java/com/google/gerrit/server/index/change/ChangeField.java @@ -128,7 +128,7 @@ public class ChangeField { /** Reference (aka branch) the change will submit onto. */ public static final FieldDef REF = - exact(ChangeQueryBuilder.FIELD_REF).build(changeGetter(c -> c.getDest().get())); + exact(ChangeQueryBuilder.FIELD_REF).build(changeGetter(c -> c.getDest().branch())); /** Topic, a short annotation on the branch. */ public static final FieldDef EXACT_TOPIC = diff --git a/java/com/google/gerrit/server/index/change/ReindexAfterRefUpdate.java b/java/com/google/gerrit/server/index/change/ReindexAfterRefUpdate.java index 4062988731..ad6edfdf02 100644 --- a/java/com/google/gerrit/server/index/change/ReindexAfterRefUpdate.java +++ b/java/com/google/gerrit/server/index/change/ReindexAfterRefUpdate.java @@ -153,7 +153,7 @@ public class ReindexAfterRefUpdate implements GitReferenceUpdatedListener { if (ref.equals(RefNames.REFS_CONFIG)) { return asChanges(queryProvider.get().byProjectOpen(project)); } - return asChanges(queryProvider.get().byBranchNew(new Branch.NameKey(project, ref))); + return asChanges(queryProvider.get().byBranchNew(Branch.nameKey(project, ref))); } @Override diff --git a/java/com/google/gerrit/server/mail/send/ChangeEmail.java b/java/com/google/gerrit/server/mail/send/ChangeEmail.java index 4905823397..7aa0aae149 100644 --- a/java/com/google/gerrit/server/mail/send/ChangeEmail.java +++ b/java/com/google/gerrit/server/mail/send/ChangeEmail.java @@ -348,7 +348,7 @@ public abstract class ChangeEmail extends NotificationEmail { return new Watchers(); } - ProjectWatch watch = new ProjectWatch(args, branch.getParentKey(), projectState, changeData); + ProjectWatch watch = new ProjectWatch(args, branch.project(), projectState, changeData); return watch.getWatchers(type, includeWatchersFromNotifyConfig); } diff --git a/java/com/google/gerrit/server/mail/send/NotificationEmail.java b/java/com/google/gerrit/server/mail/send/NotificationEmail.java index 64047bf886..6ac9b82f31 100644 --- a/java/com/google/gerrit/server/mail/send/NotificationEmail.java +++ b/java/com/google/gerrit/server/mail/send/NotificationEmail.java @@ -50,7 +50,7 @@ public abstract class NotificationEmail extends OutgoingEmail { // Set a reasonable list id so that filters can be used to sort messages setHeader( "List-Id", - ""); + ""); if (getSettingsUrl() != null) { setHeader("List-Unsubscribe", "<" + getSettingsUrl() + ">"); } @@ -104,7 +104,7 @@ public abstract class NotificationEmail extends OutgoingEmail { protected void setupSoyContext() { super.setupSoyContext(); - String projectName = branch.getParentKey().get(); + String projectName = branch.project().get(); soyContext.put("projectName", projectName); // shortProjectName is the project name with the path abbreviated. soyContext.put("shortProjectName", getShortProjectName(projectName)); @@ -118,11 +118,11 @@ public abstract class NotificationEmail extends OutgoingEmail { soyContextEmailData.put("sshHost", getSshHost()); Map branchData = new HashMap<>(); - branchData.put("shortName", branch.getShortName()); + branchData.put("shortName", branch.shortName()); soyContext.put("branch", branchData); - footers.add(MailHeader.PROJECT.withDelimiter() + branch.getParentKey().get()); - footers.add("Gerrit-Branch: " + branch.getShortName()); + footers.add(MailHeader.PROJECT.withDelimiter() + branch.project().get()); + footers.add("Gerrit-Branch: " + branch.shortName()); } @VisibleForTesting diff --git a/java/com/google/gerrit/server/notedb/ChangeNotes.java b/java/com/google/gerrit/server/notedb/ChangeNotes.java index a4e8513fba..6bf758331b 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotes.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotes.java @@ -127,7 +127,7 @@ public class ChangeNotes extends AbstractChangeNotes { public static Change newChange(Project.NameKey project, Change.Id changeId) { return new Change( - null, changeId, null, new Branch.NameKey(project, "INVALID_NOTE_DB_ONLY"), null); + null, changeId, null, Branch.nameKey(project, "INVALID_NOTE_DB_ONLY"), null); } public ChangeNotes create(Project.NameKey project, Change.Id changeId) { diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesState.java b/java/com/google/gerrit/server/notedb/ChangeNotesState.java index ad74b6417a..b96d807e69 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesState.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesState.java @@ -308,7 +308,7 @@ public abstract class ChangeNotesState { c.changeKey(), changeId(), c.owner(), - new Branch.NameKey(project, c.branch()), + Branch.nameKey(project, c.branch()), c.createdOn()); copyNonConstructorColumnsTo(change); return change; @@ -322,7 +322,7 @@ public abstract class ChangeNotesState { this); change.setKey(c.changeKey()); change.setOwner(c.owner()); - change.setDest(new Branch.NameKey(change.getProject(), c.branch())); + change.setDest(Branch.nameKey(change.getProject(), c.branch())); change.setCreatedOn(c.createdOn()); copyNonConstructorColumnsTo(change); } diff --git a/java/com/google/gerrit/server/permissions/DefaultRefFilter.java b/java/com/google/gerrit/server/permissions/DefaultRefFilter.java index a5174e1bed..594804876e 100644 --- a/java/com/google/gerrit/server/permissions/DefaultRefFilter.java +++ b/java/com/google/gerrit/server/permissions/DefaultRefFilter.java @@ -365,7 +365,7 @@ class DefaultRefFilter { try { // Default to READ_PRIVATE_CHANGES as there is no special permission for reading edits. permissionBackendForProject - .ref(visibleChanges.get(id).get()) + .ref(visibleChanges.get(id).branch()) .check(RefPermission.READ_PRIVATE_CHANGES); return true; } catch (AuthException e) { diff --git a/java/com/google/gerrit/server/permissions/PermissionBackend.java b/java/com/google/gerrit/server/permissions/PermissionBackend.java index 3d10181f48..d2466884ff 100644 --- a/java/com/google/gerrit/server/permissions/PermissionBackend.java +++ b/java/com/google/gerrit/server/permissions/PermissionBackend.java @@ -158,7 +158,7 @@ public abstract class PermissionBackend { /** Returns an instance scoped for the {@code ref}, and its parent project. */ public ForRef ref(Branch.NameKey ref) { - return project(ref.getParentKey()).ref(ref.get()); + return project(ref.project()).ref(ref.branch()); } /** Returns an instance scoped for the change, and its destination ref and project. */ @@ -280,7 +280,7 @@ public abstract class PermissionBackend { /** Returns an instance scoped for the change, and its destination ref and project. */ public ForChange change(ChangeData cd) { try { - return ref(cd.change().getDest().get()).change(cd); + return ref(cd.change().getDest().branch()).change(cd); } catch (StorageException e) { return FailedPermissionBackend.change("unavailable", e); } @@ -288,7 +288,7 @@ public abstract class PermissionBackend { /** Returns an instance scoped for the change, and its destination ref and project. */ public ForChange change(ChangeNotes notes) { - return ref(notes.getChange().getDest().get()).change(notes); + return ref(notes.getChange().getDest().branch()).change(notes); } /** @@ -297,7 +297,7 @@ public abstract class PermissionBackend { * stale data from the index is acceptable. */ public ForChange indexedChange(ChangeData cd, ChangeNotes notes) { - return ref(notes.getChange().getDest().get()).indexedChange(cd, notes); + return ref(notes.getChange().getDest().branch()).indexedChange(cd, notes); } /** Verify scoped user can {@code perm}, throwing if denied. */ diff --git a/java/com/google/gerrit/server/permissions/ProjectControl.java b/java/com/google/gerrit/server/permissions/ProjectControl.java index e37015105f..369028bdf6 100644 --- a/java/com/google/gerrit/server/permissions/ProjectControl.java +++ b/java/com/google/gerrit/server/permissions/ProjectControl.java @@ -109,7 +109,7 @@ class ProjectControl { } RefControl controlForRef(Branch.NameKey ref) { - return controlForRef(ref.get()); + return controlForRef(ref.branch()); } public RefControl controlForRef(String refName) { diff --git a/java/com/google/gerrit/server/project/BranchResource.java b/java/com/google/gerrit/server/project/BranchResource.java index 622b1ddad4..882dab7852 100644 --- a/java/com/google/gerrit/server/project/BranchResource.java +++ b/java/com/google/gerrit/server/project/BranchResource.java @@ -34,7 +34,7 @@ public class BranchResource extends RefResource { } public Branch.NameKey getBranchKey() { - return new Branch.NameKey(getNameKey(), refName); + return Branch.nameKey(getNameKey(), refName); } @Override diff --git a/java/com/google/gerrit/server/project/CreateRefControl.java b/java/com/google/gerrit/server/project/CreateRefControl.java index 34f3c33923..63cb2949a9 100644 --- a/java/com/google/gerrit/server/project/CreateRefControl.java +++ b/java/com/google/gerrit/server/project/CreateRefControl.java @@ -70,9 +70,9 @@ public class CreateRefControl { RevObject object) throws AuthException, PermissionBackendException, NoSuchProjectException, IOException, ResourceConflictException { - ProjectState ps = projectCache.checkedGet(branch.getParentKey()); + ProjectState ps = projectCache.checkedGet(branch.project()); if (ps == null) { - throw new NoSuchProjectException(branch.getParentKey()); + throw new NoSuchProjectException(branch.project()); } ps.checkStatePermitsWrite(); @@ -85,8 +85,7 @@ public class CreateRefControl { try (RevWalk rw = new RevWalk(repo)) { rw.parseBody(tag); } catch (IOException e) { - logger.atSevere().withCause(e).log( - "RevWalk(%s) parsing %s:", branch.getParentKey(), tag.name()); + logger.atSevere().withCause(e).log("RevWalk(%s) parsing %s:", branch.project(), tag.name()); throw e; } diff --git a/java/com/google/gerrit/server/project/ProjectState.java b/java/com/google/gerrit/server/project/ProjectState.java index 921d382779..dbe5580075 100644 --- a/java/com/google/gerrit/server/project/ProjectState.java +++ b/java/com/google/gerrit/server/project/ProjectState.java @@ -592,6 +592,6 @@ public class ProjectState { } private boolean match(Branch.NameKey destination, String refPattern) { - return RefPatternMatcher.getMatcher(refPattern).match(destination.get(), null); + return RefPatternMatcher.getMatcher(refPattern).match(destination.branch(), null); } } diff --git a/java/com/google/gerrit/server/project/RemoveReviewerControl.java b/java/com/google/gerrit/server/project/RemoveReviewerControl.java index eeb2a65419..d7c03335cb 100644 --- a/java/com/google/gerrit/server/project/RemoveReviewerControl.java +++ b/java/com/google/gerrit/server/project/RemoveReviewerControl.java @@ -108,7 +108,7 @@ public class RemoveReviewerControl { // owner and site admin can remove anyone PermissionBackend.WithUser withUser = permissionBackend.user(currentUser); PermissionBackend.ForProject forProject = withUser.project(change.getProject()); - if (check(forProject.ref(change.getDest().get()), RefPermission.WRITE_CONFIG) + if (check(forProject.ref(change.getDest().branch()), RefPermission.WRITE_CONFIG) || check(withUser, GlobalPermission.ADMINISTRATE_SERVER)) { return true; } diff --git a/java/com/google/gerrit/server/query/change/ChangeData.java b/java/com/google/gerrit/server/query/change/ChangeData.java index 619569f927..5a7a8a67cb 100644 --- a/java/com/google/gerrit/server/query/change/ChangeData.java +++ b/java/com/google/gerrit/server/query/change/ChangeData.java @@ -887,7 +887,7 @@ public class ChangeData { } try (Repository repo = repoManager.openRepository(project())) { - Ref ref = repo.getRefDatabase().exactRef(c.getDest().get()); + Ref ref = repo.getRefDatabase().exactRef(c.getDest().branch()); SubmitTypeRecord str = submitTypeRecord(); if (!str.isOk()) { // If submit type rules are broken, it's definitely not mergeable. diff --git a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java index 59a2720734..218d5269ee 100644 --- a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java +++ b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java @@ -455,7 +455,7 @@ public class ChangeQueryBuilder extends QueryBuilder> and = new ArrayList<>(5); and.add(new ProjectPredicate(c.getProject().get())); - and.add(new RefPredicate(c.getDest().get())); + and.add(new RefPredicate(c.getDest().branch())); and.add(Predicate.not(new LegacyChangeIdPredicate(c.getId()))); and.add(Predicate.or(filePredicates)); diff --git a/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java b/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java index acf2e25d03..3bcdd66ee8 100644 --- a/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java +++ b/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java @@ -60,7 +60,7 @@ public class EqualsLabelPredicate extends ChangeIndexPredicate { return false; } - ProjectState project = projectCache.get(c.getDest().getParentKey()); + ProjectState project = projectCache.get(c.getDest().project()); if (project == null) { // The project has disappeared. // diff --git a/java/com/google/gerrit/server/query/change/InternalChangeQuery.java b/java/com/google/gerrit/server/query/change/InternalChangeQuery.java index 74a0f71d1a..147ec84372 100644 --- a/java/com/google/gerrit/server/query/change/InternalChangeQuery.java +++ b/java/com/google/gerrit/server/query/change/InternalChangeQuery.java @@ -56,7 +56,7 @@ import org.eclipse.jgit.lib.Repository; */ public class InternalChangeQuery extends InternalQuery { private static Predicate ref(Branch.NameKey branch) { - return new RefPredicate(branch.get()); + return new RefPredicate(branch.branch()); } private static Predicate change(Change.Key key) { @@ -115,16 +115,16 @@ public class InternalChangeQuery extends InternalQuery byBranchKeyOpen(Project.NameKey project, String branch, Change.Key key) { - return query(and(byBranchKeyPred(new Branch.NameKey(project, branch), key), open())); + return query(and(byBranchKeyPred(Branch.nameKey(project, branch), key), open())); } public static Predicate byBranchKeyOpenPred( Project.NameKey project, String branch, Change.Key key) { - return and(byBranchKeyPred(new Branch.NameKey(project, branch), key), open()); + return and(byBranchKeyPred(Branch.nameKey(project, branch), key), open()); } private static Predicate byBranchKeyPred(Branch.NameKey branch, Change.Key key) { - return and(ref(branch), project(branch.getParentKey()), change(key)); + return and(ref(branch), project(branch.project()), change(key)); } public List byProject(Project.NameKey project) { @@ -132,11 +132,11 @@ public class InternalChangeQuery extends InternalQuery byBranchOpen(Branch.NameKey branch) { - return query(and(ref(branch), project(branch.getParentKey()), open())); + return query(and(ref(branch), project(branch.project()), open())); } public List byBranchNew(Branch.NameKey branch) { - return query(and(ref(branch), project(branch.getParentKey()), status(Change.Status.NEW))); + return query(and(ref(branch), project(branch.project()), status(Change.Status.NEW))); } public Iterable byCommitsOnBranchNotMerged( @@ -180,7 +180,7 @@ public class InternalChangeQuery extends InternalQuery notes = notesFactory.create( - branch.getParentKey(), + branch.project(), changeIds, cn -> { Change c = cn.getChange(); @@ -194,7 +194,7 @@ public class InternalChangeQuery extends InternalQuery byBranchCommit(Branch.NameKey branch, String hash) { - return byBranchCommit(branch.getParentKey().get(), branch.get(), hash); + return byBranchCommit(branch.project().get(), branch.branch(), hash); } public List byBranchCommitOpen(String project, String branch, String hash) { diff --git a/java/com/google/gerrit/server/query/change/ProjectPredicate.java b/java/com/google/gerrit/server/query/change/ProjectPredicate.java index febd6c64f5..664ffb176d 100644 --- a/java/com/google/gerrit/server/query/change/ProjectPredicate.java +++ b/java/com/google/gerrit/server/query/change/ProjectPredicate.java @@ -34,7 +34,7 @@ public class ProjectPredicate extends ChangeIndexPredicate { return false; } - Project.NameKey p = change.getDest().getParentKey(); + Project.NameKey p = change.getDest().project(); return p.equals(getValueKey()); } diff --git a/java/com/google/gerrit/server/query/change/ProjectPrefixPredicate.java b/java/com/google/gerrit/server/query/change/ProjectPrefixPredicate.java index 744f4d27ef..b337336806 100644 --- a/java/com/google/gerrit/server/query/change/ProjectPrefixPredicate.java +++ b/java/com/google/gerrit/server/query/change/ProjectPrefixPredicate.java @@ -25,7 +25,7 @@ public class ProjectPrefixPredicate extends ChangeIndexPredicate { @Override public boolean match(ChangeData object) { Change c = object.change(); - return c != null && c.getDest().getParentKey().get().startsWith(getValue()); + return c != null && c.getDest().project().get().startsWith(getValue()); } @Override diff --git a/java/com/google/gerrit/server/query/change/RefPredicate.java b/java/com/google/gerrit/server/query/change/RefPredicate.java index 2ed4c99dd4..10eea71bad 100644 --- a/java/com/google/gerrit/server/query/change/RefPredicate.java +++ b/java/com/google/gerrit/server/query/change/RefPredicate.java @@ -28,7 +28,7 @@ public class RefPredicate extends ChangeIndexPredicate { if (change == null) { return false; } - return getValue().equals(change.getDest().get()); + return getValue().equals(change.getDest().branch()); } @Override diff --git a/java/com/google/gerrit/server/query/change/RegexProjectPredicate.java b/java/com/google/gerrit/server/query/change/RegexProjectPredicate.java index 46a17f6798..a859b32454 100644 --- a/java/com/google/gerrit/server/query/change/RegexProjectPredicate.java +++ b/java/com/google/gerrit/server/query/change/RegexProjectPredicate.java @@ -44,7 +44,7 @@ public class RegexProjectPredicate extends ChangeRegexPredicate { return false; } - Project.NameKey p = change.getDest().getParentKey(); + Project.NameKey p = change.getDest().project(); return pattern.run(p.get()); } diff --git a/java/com/google/gerrit/server/query/change/RegexRefPredicate.java b/java/com/google/gerrit/server/query/change/RegexRefPredicate.java index af211e630a..f999cc4472 100644 --- a/java/com/google/gerrit/server/query/change/RegexRefPredicate.java +++ b/java/com/google/gerrit/server/query/change/RegexRefPredicate.java @@ -42,7 +42,7 @@ public class RegexRefPredicate extends ChangeRegexPredicate { if (change == null) { return false; } - return pattern.run(change.getDest().get()); + return pattern.run(change.getDest().branch()); } @Override diff --git a/java/com/google/gerrit/server/restapi/change/CherryPick.java b/java/com/google/gerrit/server/restapi/change/CherryPick.java index 72781c3bea..548aeb72ee 100644 --- a/java/com/google/gerrit/server/restapi/change/CherryPick.java +++ b/java/com/google/gerrit/server/restapi/change/CherryPick.java @@ -103,7 +103,7 @@ public class CherryPick rsrc.getChange(), rsrc.getPatchSet(), input, - new Branch.NameKey(rsrc.getProject(), refName)); + Branch.nameKey(rsrc.getProject(), refName)); CherryPickChangeInfo changeInfo = json.noOptions() .format(rsrc.getProject(), cherryPickResult.changeId(), CherryPickChangeInfo::new); diff --git a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java index 19a92330f2..d8d5adff3b 100644 --- a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java +++ b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java @@ -169,10 +169,10 @@ public class CherryPickChange { ObjectInserter oi = git.newObjectInserter(); ObjectReader reader = oi.newReader(); CodeReviewRevWalk revWalk = CodeReviewCommit.newRevWalk(reader)) { - Ref destRef = git.getRefDatabase().exactRef(dest.get()); + Ref destRef = git.getRefDatabase().exactRef(dest.branch()); if (destRef == null) { throw new InvalidChangeOperationException( - String.format("Branch %s does not exist.", dest.get())); + String.format("Branch %s does not exist.", dest.branch())); } RevCommit baseCommit = getBaseCommit(destRef, project.get(), revWalk, input.base); @@ -200,9 +200,9 @@ public class CherryPickChange { String commitMessage = ChangeIdUtil.insertId(input.message, computedChangeId).trim() + '\n'; CodeReviewCommit cherryPickCommit; - ProjectState projectState = projectCache.checkedGet(dest.getParentKey()); + ProjectState projectState = projectCache.checkedGet(dest.project()); if (projectState == null) { - throw new NoSuchProjectException(dest.getParentKey()); + throw new NoSuchProjectException(dest.project()); } try { MergeUtil mergeUtil; @@ -235,7 +235,7 @@ public class CherryPickChange { changeKey = new Change.Key("I" + computedChangeId.name()); } - Branch.NameKey newDest = new Branch.NameKey(project, destRef.getName()); + Branch.NameKey newDest = Branch.nameKey(project, destRef.getName()); List destChanges = queryProvider.get().setLimit(2).byBranchKey(newDest, changeKey); if (destChanges.size() > 1) { @@ -258,11 +258,17 @@ public class CherryPickChange { // change. String newTopic = null; if (sourceChange != null && !Strings.isNullOrEmpty(sourceChange.getTopic())) { - newTopic = sourceChange.getTopic() + "-" + newDest.getShortName(); + newTopic = sourceChange.getTopic() + "-" + newDest.shortName(); } changeId = createNewChange( - bu, cherryPickCommit, dest.get(), newTopic, sourceChange, sourceCommit, input); + bu, + cherryPickCommit, + dest.branch(), + newTopic, + sourceChange, + sourceCommit, + input); } bu.execute(); return Result.create(changeId, cherryPickCommit.getFilesWithGitConflicts()); @@ -374,7 +380,7 @@ public class CherryPickChange { CodeReviewCommit cherryPickCommit) { StringBuilder stringBuilder = new StringBuilder("Patch Set ").append(patchSetId.get()); if (sourceBranch != null) { - stringBuilder.append(": Cherry Picked from branch ").append(sourceBranch.getShortName()); + stringBuilder.append(": Cherry Picked from branch ").append(sourceBranch.shortName()); } else { stringBuilder.append(": Cherry Picked from commit ").append(sourceCommit.getName()); } diff --git a/java/com/google/gerrit/server/restapi/change/CherryPickCommit.java b/java/com/google/gerrit/server/restapi/change/CherryPickCommit.java index f34f1787fd..f498a963af 100644 --- a/java/com/google/gerrit/server/restapi/change/CherryPickCommit.java +++ b/java/com/google/gerrit/server/restapi/change/CherryPickCommit.java @@ -102,7 +102,7 @@ public class CherryPickCommit projectName, commit, input, - new Branch.NameKey(rsrc.getProjectState().getNameKey(), refName)); + Branch.nameKey(rsrc.getProjectState().getNameKey(), refName)); CherryPickChangeInfo changeInfo = json.noOptions() .format(projectName, cherryPickResult.changeId(), CherryPickChangeInfo::new); diff --git a/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java b/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java index d3e737f220..fb64b85f42 100644 --- a/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java +++ b/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java @@ -234,7 +234,7 @@ public class CreateMergePatchSet parentCommit = currentPsCommit.getId(); } else { // get the current branch tip of destination branch - Ref destRef = git.getRefDatabase().exactRef(dest.get()); + Ref destRef = git.getRefDatabase().exactRef(dest.branch()); if (destRef != null) { parentCommit = destRef.getObjectId(); } else { diff --git a/java/com/google/gerrit/server/restapi/change/Mergeable.java b/java/com/google/gerrit/server/restapi/change/Mergeable.java index ece8938379..eb116a6074 100644 --- a/java/com/google/gerrit/server/restapi/change/Mergeable.java +++ b/java/com/google/gerrit/server/restapi/change/Mergeable.java @@ -107,7 +107,7 @@ public class Mergeable implements RestReadView { try (Repository git = gitManager.openRepository(change.getProject())) { ObjectId commit = toId(ps); - Ref ref = git.getRefDatabase().exactRef(change.getDest().get()); + Ref ref = git.getRefDatabase().exactRef(change.getDest().branch()); ProjectState projectState = projectCache.get(change.getProject()); String strategy = mergeUtilFactory.create(projectState).mergeStrategyName(); result.strategy = strategy; diff --git a/java/com/google/gerrit/server/restapi/change/Move.java b/java/com/google/gerrit/server/restapi/change/Move.java index 02992347f7..0cfcd274a7 100644 --- a/java/com/google/gerrit/server/restapi/change/Move.java +++ b/java/com/google/gerrit/server/restapi/change/Move.java @@ -135,7 +135,7 @@ public class Move extends RetryingRestModifyView params = ImmutableMap.of( "patchSet", String.valueOf(resource.getPatchSet().getPatchSetId()), - "branch", change.getDest().getShortName(), + "branch", change.getDest().shortName(), "commit", ObjectId.fromString(revId.get()).abbreviate(7).name(), "submitSize", String.valueOf(cs.size())); ParameterizedString tp = cs.size() > 1 ? titlePatternWithAncestors : titlePattern; @@ -388,7 +388,7 @@ public class Submit ListMultimap cbb = cs.changesByBranch(); for (Branch.NameKey branch : cbb.keySet()) { Collection targetBranch = cbb.get(branch); - HashMap commits = findCommits(targetBranch, branch.getParentKey()); + HashMap commits = findCommits(targetBranch, branch.project()); Set allParents = Sets.newHashSetWithExpectedSize(cs.size()); for (RevCommit commit : commits.values()) { diff --git a/java/com/google/gerrit/server/restapi/project/CheckAccess.java b/java/com/google/gerrit/server/restapi/project/CheckAccess.java index 67b68b578f..9eb9be4e5b 100644 --- a/java/com/google/gerrit/server/restapi/project/CheckAccess.java +++ b/java/com/google/gerrit/server/restapi/project/CheckAccess.java @@ -106,7 +106,7 @@ public class CheckAccess implements RestModifyView { @Override public Response apply(BranchResource rsrc, Input input) throws RestApiException, IOException, PermissionBackendException { - if (isConfigRef(rsrc.getBranchKey().get())) { + if (isConfigRef(rsrc.getBranchKey().branch())) { // Never allow to delete the meta config branch. throw new MethodNotAllowedException( - "not allowed to delete branch " + rsrc.getBranchKey().get()); + "not allowed to delete branch " + rsrc.getBranchKey().branch()); } if (!queryProvider.get().setLimit(1).byBranchOpen(rsrc.getBranchKey()).isEmpty()) { diff --git a/java/com/google/gerrit/server/restapi/project/DeleteRef.java b/java/com/google/gerrit/server/restapi/project/DeleteRef.java index 8861c0b394..4e5154e2cc 100644 --- a/java/com/google/gerrit/server/restapi/project/DeleteRef.java +++ b/java/com/google/gerrit/server/restapi/project/DeleteRef.java @@ -260,7 +260,7 @@ public class DeleteRef { } if (!refName.startsWith(R_TAGS)) { - Branch.NameKey branchKey = new Branch.NameKey(projectState.getNameKey(), ref.getName()); + Branch.NameKey branchKey = Branch.nameKey(projectState.getNameKey(), ref.getName()); if (!queryProvider.get().setLimit(1).byBranchOpen(branchKey).isEmpty()) { command.setResult(Result.REJECTED_OTHER_REASON, "it has open changes"); } diff --git a/java/com/google/gerrit/server/submit/GitModules.java b/java/com/google/gerrit/server/submit/GitModules.java index d49f53f2f9..59641a4692 100644 --- a/java/com/google/gerrit/server/submit/GitModules.java +++ b/java/com/google/gerrit/server/submit/GitModules.java @@ -58,13 +58,13 @@ public class GitModules { @Assisted Branch.NameKey branch, @Assisted MergeOpRepoManager orm) throws IOException { - Project.NameKey project = branch.getParentKey(); + Project.NameKey project = branch.project(); logger.atFine().log("Loading .gitmodules of %s for project %s", branch, project); try { OpenRepo or = orm.getRepo(project); - ObjectId id = or.repo.resolve(branch.get()); + ObjectId id = or.repo.resolve(branch.branch()); if (id == null) { - throw new IOException("Cannot open branch " + branch.get()); + throw new IOException("Cannot open branch " + branch.branch()); } RevCommit commit = or.rw.parseCommit(id); @@ -80,7 +80,7 @@ public class GitModules { config = new BlobBasedConfig(null, or.repo, commit, GIT_MODULES); } catch (ConfigInvalidException e) { throw new IOException( - "Could not read .gitmodules of super project: " + branch.getParentKey(), e); + "Could not read .gitmodules of super project: " + branch.project(), e); } subscriptions = new SubmoduleSectionParser(config, canonicalWebUrl, branch).parseAllSections(); diff --git a/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java b/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java index 831a8b854e..ab92270e94 100644 --- a/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java +++ b/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java @@ -118,7 +118,7 @@ public class LocalMergeSuperSetComputation implements MergeSuperSetComputation { ImmutableListMultimap bc = byBranch(Iterables.concat(changeSet.changes(), changeSet.nonVisibleChanges())); for (Branch.NameKey b : bc.keySet()) { - OpenRepo or = getRepo(orm, b.getParentKey()); + OpenRepo or = getRepo(orm, b.project()); List visibleCommits = new ArrayList<>(); List nonVisibleCommits = new ArrayList<>(); for (ChangeData cd : bc.get(b)) { @@ -272,7 +272,7 @@ public class LocalMergeSuperSetComputation implements MergeSuperSetComputation { private void markHeadUninteresting(OpenRepo or, Branch.NameKey b) throws IOException { Optional head = heads.get(b); if (head == null) { - Ref ref = or.repo.getRefDatabase().exactRef(b.get()); + Ref ref = or.repo.getRefDatabase().exactRef(b.branch()); head = ref != null ? Optional.of(or.rw.parseCommit(ref.getObjectId())) : Optional.empty(); heads.put(b, head); } diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java index 5a38adbaa0..2da4f711ec 100644 --- a/java/com/google/gerrit/server/submit/MergeOp.java +++ b/java/com/google/gerrit/server/submit/MergeOp.java @@ -584,7 +584,7 @@ public class MergeOp implements AutoCloseable { Set branches = cbb.keySet(); for (Branch.NameKey branch : branches) { - OpenRepo or = openRepo(branch.getParentKey()); + OpenRepo or = openRepo(branch.project()); if (or != null) { toSubmit.put(branch, validateChangeList(or, cbb.get(branch))); } @@ -648,7 +648,7 @@ public class MergeOp implements AutoCloseable { Set allCommits = toSubmit.values().stream().map(BranchBatch::commits).flatMap(Set::stream).collect(toSet()); for (Branch.NameKey branch : allBranches) { - OpenRepo or = orm.getRepo(branch.getParentKey()); + OpenRepo or = orm.getRepo(branch.project()); if (toSubmit.containsKey(branch)) { BranchBatch submitting = toSubmit.get(branch); logger.atFine().log("adding ops for branch batch %s", submitting); diff --git a/java/com/google/gerrit/server/submit/MergeOpRepoManager.java b/java/com/google/gerrit/server/submit/MergeOpRepoManager.java index 764aca8ce0..c3d3b543a1 100644 --- a/java/com/google/gerrit/server/submit/MergeOpRepoManager.java +++ b/java/com/google/gerrit/server/submit/MergeOpRepoManager.java @@ -136,11 +136,11 @@ public class MergeOpRepoManager implements AutoCloseable { OpenBranch(OpenRepo or, Branch.NameKey name) throws IntegrationException { try { - update = or.repo.updateRef(name.get()); + update = or.repo.updateRef(name.branch()); if (update.getOldObjectId() != null) { oldTip = or.rw.parseCommit(update.getOldObjectId()); - } else if (Objects.equals(or.repo.getFullBranch(), name.get()) - || Objects.equals(RefNames.REFS_CONFIG, name.get())) { + } else if (Objects.equals(or.repo.getFullBranch(), name.branch()) + || Objects.equals(RefNames.REFS_CONFIG, name.branch())) { oldTip = null; update.setExpectedOldObjectId(ObjectId.zeroId()); } else { diff --git a/java/com/google/gerrit/server/submit/SubmitDryRun.java b/java/com/google/gerrit/server/submit/SubmitDryRun.java index 391d9562bb..fbfa4686db 100644 --- a/java/com/google/gerrit/server/submit/SubmitDryRun.java +++ b/java/com/google/gerrit/server/submit/SubmitDryRun.java @@ -156,9 +156,9 @@ public class SubmitDryRun { } private ProjectState getProject(Branch.NameKey branch) throws NoSuchProjectException { - ProjectState p = projectCache.get(branch.getParentKey()); + ProjectState p = projectCache.get(branch.project()); if (p == null) { - throw new NoSuchProjectException(branch.getParentKey()); + throw new NoSuchProjectException(branch.project()); } return p; } diff --git a/java/com/google/gerrit/server/submit/SubmitStrategy.java b/java/com/google/gerrit/server/submit/SubmitStrategy.java index dc221f87a2..4acfd338d3 100644 --- a/java/com/google/gerrit/server/submit/SubmitStrategy.java +++ b/java/com/google/gerrit/server/submit/SubmitStrategy.java @@ -197,8 +197,8 @@ public abstract class SubmitStrategy { this.project = requireNonNull( - projectCache.get(destBranch.getParentKey()), - () -> String.format("project not found: %s", destBranch.getParentKey())); + projectCache.get(destBranch.project()), + () -> String.format("project not found: %s", destBranch.project())); this.mergeSorter = new MergeSorter(caller, rw, alreadyAccepted, canMergeFlag, queryProvider, incoming); this.rebaseSorter = diff --git a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java index 73bcc09d2d..b363735c88 100644 --- a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java +++ b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java @@ -94,7 +94,7 @@ abstract class SubmitStrategyOp implements BatchUpdateOp { } protected final Project.NameKey getProject() { - return getDest().getParentKey(); + return getDest().project(); } @Override @@ -132,14 +132,15 @@ abstract class SubmitStrategyOp implements BatchUpdateOp { // Needed by postUpdate, at which point mergeTip will have advanced further, // so it's easier to just snapshot the command. command = - new ReceiveCommand(firstNonNull(tipBefore, ObjectId.zeroId()), tipAfter, getDest().get()); + new ReceiveCommand( + firstNonNull(tipBefore, ObjectId.zeroId()), tipAfter, getDest().branch()); ctx.addRefUpdate(command); args.submoduleOp.addBranchTip(getDest(), tipAfter); } private void checkProjectConfig(RepoContext ctx, CodeReviewCommit commit) throws IntegrationException { - String refName = getDest().get(); + String refName = getDest().branch(); if (RefNames.REFS_CONFIG.equals(refName)) { logger.atFine().log("Loading new configuration from %s", RefNames.REFS_CONFIG); try { @@ -483,7 +484,7 @@ abstract class SubmitStrategyOp implements BatchUpdateOp { getProject(), command.getRefName(), command.getOldId(), command.getNewId()); // TODO(dborowitz): Move to BatchUpdate? Would also allow us to run once // per project even if multiple changes to refs/meta/config are submitted. - if (RefNames.REFS_CONFIG.equals(getDest().get())) { + if (RefNames.REFS_CONFIG.equals(getDest().branch())) { args.projectCache.evict(getProject()); ProjectState p = args.projectCache.get(getProject()); try (Repository git = args.repoManager.openRepository(getProject())) { diff --git a/java/com/google/gerrit/server/submit/SubmoduleOp.java b/java/com/google/gerrit/server/submit/SubmoduleOp.java index 9b418dbacc..75a3d00e2d 100644 --- a/java/com/google/gerrit/server/submit/SubmoduleOp.java +++ b/java/com/google/gerrit/server/submit/SubmoduleOp.java @@ -89,7 +89,7 @@ public class SubmoduleOp { public void updateRepo(RepoContext ctx) throws Exception { CodeReviewCommit c = composeGitlinksCommit(branch); if (c != null) { - ctx.addRefUpdate(c.getParent(0), c, branch.get()); + ctx.addRefUpdate(c.getParent(0), c, branch.branch()); addBranchTip(branch, c); } } @@ -264,7 +264,7 @@ public class SubmoduleOp { Branch.NameKey superBranch = sub.getSuperProject(); searchForSuperprojects(superBranch, currentVisited, allVisited); targets.put(superBranch, sub); - branchesByProject.put(superBranch.getParentKey(), superBranch); + branchesByProject.put(superBranch.project(), superBranch); affectedBranches.add(superBranch); affectedBranches.add(sub.getSubmodule()); } @@ -309,25 +309,25 @@ public class SubmoduleOp { logger.atFine().log("Inspecting SubscribeSection %s", s); for (RefSpec r : s.getMatchingRefSpecs()) { logger.atFine().log("Inspecting [matching] ref %s", r); - if (!r.matchSource(src.get())) { + if (!r.matchSource(src.branch())) { continue; } if (r.isWildcard()) { // refs/heads/*[:refs/somewhere/*] - ret.add(new Branch.NameKey(s.getProject(), r.expandFromSource(src.get()).getDestination())); + ret.add(Branch.nameKey(s.getProject(), r.expandFromSource(src.branch()).getDestination())); } else { // e.g. refs/heads/master[:refs/heads/stable] String dest = r.getDestination(); if (dest == null) { dest = r.getSource(); } - ret.add(new Branch.NameKey(s.getProject(), dest)); + ret.add(Branch.nameKey(s.getProject(), dest)); } } for (RefSpec r : s.getMultiMatchRefSpecs()) { logger.atFine().log("Inspecting [all] ref %s", r); - if (!r.matchSource(src.get())) { + if (!r.matchSource(src.branch())) { continue; } OpenRepo or; @@ -344,7 +344,7 @@ public class SubmoduleOp { if (r.getDestination() != null && !r.matchDestination(ref.getName())) { continue; } - Branch.NameKey b = new Branch.NameKey(s.getProject(), ref.getName()); + Branch.NameKey b = Branch.nameKey(s.getProject(), ref.getName()); if (!ret.contains(b)) { ret.add(b); } @@ -359,15 +359,15 @@ public class SubmoduleOp { Branch.NameKey srcBranch) throws IOException { logger.atFine().log("Calculating possible superprojects for %s", srcBranch); Collection ret = new ArrayList<>(); - Project.NameKey srcProject = srcBranch.getParentKey(); + Project.NameKey srcProject = srcBranch.project(); for (SubscribeSection s : projectCache.get(srcProject).getSubscribeSections(srcBranch)) { logger.atFine().log("Checking subscribe section %s", s); Collection branches = getDestinationBranches(srcBranch, s); for (Branch.NameKey targetBranch : branches) { - Project.NameKey targetProject = targetBranch.getParentKey(); + Project.NameKey targetProject = targetBranch.project(); try { OpenRepo or = orm.getRepo(targetProject); - ObjectId id = or.repo.resolve(targetBranch.get()); + ObjectId id = or.repo.resolve(targetBranch.branch()); if (id == null) { logger.atFine().log("The branch %s doesn't exist.", targetBranch); continue; @@ -419,7 +419,7 @@ public class SubmoduleOp { throws IOException, SubmoduleException { OpenRepo or; try { - or = orm.getRepo(subscriber.getParentKey()); + or = orm.getRepo(subscriber.project()); } catch (NoSuchProjectException | IOException e) { throw new SubmoduleException("Cannot access superproject", e); } @@ -428,7 +428,7 @@ public class SubmoduleOp { if (branchTips.containsKey(subscriber)) { currentCommit = branchTips.get(subscriber); } else { - Ref r = or.repo.exactRef(subscriber.get()); + Ref r = or.repo.exactRef(subscriber.branch()); if (r == null) { throw new SubmoduleException( "The branch was probably deleted from the subscriber repository"); @@ -489,7 +489,7 @@ public class SubmoduleOp { throws IOException, SubmoduleException { OpenRepo or; try { - or = orm.getRepo(subscriber.getParentKey()); + or = orm.getRepo(subscriber.project()); } catch (NoSuchProjectException | IOException e) { throw new SubmoduleException("Cannot access superproject", e); } @@ -531,7 +531,7 @@ public class SubmoduleOp { logger.atFine().log("Updating gitlink for %s", s); OpenRepo subOr; try { - subOr = orm.getRepo(s.getSubmodule().getParentKey()); + subOr = orm.getRepo(s.getSubmodule().project()); } catch (NoSuchProjectException | IOException e) { throw new SubmoduleException("Cannot access submodule", e); } @@ -544,7 +544,7 @@ public class SubmoduleOp { "Requested to update gitlink " + s.getPath() + " in " - + s.getSubmodule().getParentKey().get() + + s.getSubmodule().project().get() + " but entry " + "doesn't have gitlink file mode."; throw new SubmoduleException(errMsg); @@ -576,7 +576,7 @@ public class SubmoduleOp { // superproject is still subscribed to this branch. Re-read the ref to see if anything has // changed since the last time the gitlink was updated, and roll that update into the same // commit as all other submodule updates. - Ref ref = subOr.repo.getRefDatabase().exactRef(s.getSubmodule().get()); + Ref ref = subOr.repo.getRefDatabase().exactRef(s.getSubmodule().branch()); if (ref == null) { ed.add(new DeletePath(s.getPath())); return null; @@ -615,7 +615,7 @@ public class SubmoduleOp { msgbuf.append("* Update "); msgbuf.append(s.getPath()); msgbuf.append(" from branch '"); - msgbuf.append(s.getSubmodule().getShortName()); + msgbuf.append(s.getSubmodule().shortName()); msgbuf.append("'"); msgbuf.append("\n to "); msgbuf.append(newCommit.getName()); @@ -676,7 +676,7 @@ public class SubmoduleOp { } for (Branch.NameKey branch : updatedBranches) { - projects.add(branch.getParentKey()); + projects.add(branch.project()); } return ImmutableSet.copyOf(projects); } @@ -700,7 +700,7 @@ public class SubmoduleOp { for (Branch.NameKey branch : branchesByProject.get(project)) { Collection subscriptions = targets.get(branch); for (SubmoduleSubscription s : subscriptions) { - subprojects.add(s.getSubmodule().getParentKey()); + subprojects.add(s.getSubmodule().project()); } } diff --git a/java/com/google/gerrit/server/util/git/SubmoduleSectionParser.java b/java/com/google/gerrit/server/util/git/SubmoduleSectionParser.java index f05d1d774b..6833124f73 100644 --- a/java/com/google/gerrit/server/util/git/SubmoduleSectionParser.java +++ b/java/com/google/gerrit/server/util/git/SubmoduleSectionParser.java @@ -81,13 +81,13 @@ public class SubmoduleSectionParser { String project; if (branch.equals(".")) { - branch = superProjectBranch.get(); + branch = superProjectBranch.branch(); } // relative URL if (url.startsWith("../")) { // prefix with a slash for easier relative path walks - project = '/' + superProjectBranch.getParentKey().get(); + project = '/' + superProjectBranch.project().get(); String hostPart = url; while (hostPart.startsWith("../")) { int lastSlash = project.lastIndexOf('/'); @@ -135,7 +135,7 @@ public class SubmoduleSectionParser { } Project.NameKey projectKey = new Project.NameKey(project); return new SubmoduleSubscription( - superProjectBranch, new Branch.NameKey(projectKey, branch), path); + superProjectBranch, Branch.nameKey(projectKey, branch), path); } } catch (URISyntaxException e) { // Error in url syntax (in fact it is uri syntax) diff --git a/java/com/google/gerrit/sshd/commands/PatchSetParser.java b/java/com/google/gerrit/sshd/commands/PatchSetParser.java index a6e802a5c5..4618847822 100644 --- a/java/com/google/gerrit/sshd/commands/PatchSetParser.java +++ b/java/com/google/gerrit/sshd/commands/PatchSetParser.java @@ -147,7 +147,7 @@ public class PatchSetParser { // No --branch option, so they want every branch. return true; } - return change.getDest().get().equals(branch); + return change.getDest().branch().equals(branch); } public static UnloggedFailure error(String msg) { diff --git a/java/com/google/gerrit/testing/TestChanges.java b/java/com/google/gerrit/testing/TestChanges.java index fd097d33e3..f2c9b6d213 100644 --- a/java/com/google/gerrit/testing/TestChanges.java +++ b/java/com/google/gerrit/testing/TestChanges.java @@ -58,7 +58,7 @@ public class TestChanges { new Change.Key("Iabcd1234abcd1234abcd1234abcd1234abcd1234"), changeId, userId, - new Branch.NameKey(project, "master"), + Branch.nameKey(project, "master"), TimeUtil.nowTs()); incrementPatchSet(c); return c; @@ -115,11 +115,11 @@ public class TestChanges { .author(ident) .committer(ident) .message(firstNonNull(c.getSubject(), "Test change")); - Ref parent = repo.exactRef(c.getDest().get()); + Ref parent = repo.exactRef(c.getDest().branch()); if (parent != null) { cb.parent(tr.getRevWalk().parseCommit(parent.getObjectId())); } - update.setBranch(c.getDest().get()); + update.setBranch(c.getDest().branch()); update.setChangeId(c.getKey().get()); update.setCommit(tr.getRevWalk(), cb.create()); return update; diff --git a/java/gerrit/PRED_change_branch_1.java b/java/gerrit/PRED_change_branch_1.java index 0a7bb74184..d0a1e47693 100644 --- a/java/gerrit/PRED_change_branch_1.java +++ b/java/gerrit/PRED_change_branch_1.java @@ -36,7 +36,7 @@ public class PRED_change_branch_1 extends Predicate.P1 { Branch.NameKey name = StoredValues.getChange(engine).getDest(); - if (!a1.unify(SymbolTerm.create(name.get()), engine.trail)) { + if (!a1.unify(SymbolTerm.create(name.branch()), engine.trail)) { return engine.fail(); } return cont; diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java index ec4098b395..c2b4b9e28e 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java @@ -1295,7 +1295,7 @@ public class AccountIT extends AbstractDaemonTest { PushOneCommit.Result r = push.to(MagicBranch.NEW_CHANGE + userRefName); r.assertOkStatus(); accountIndexedCounter.assertNoReindex(); - assertThat(r.getChange().change().getDest().get()).isEqualTo(userRefName); + assertThat(r.getChange().change().getDest().branch()).isEqualTo(userRefName); gApi.changes().id(r.getChangeId()).current().review(ReviewInput.approve()); gApi.changes().id(r.getChangeId()).current().submit(); accountIndexedCounter.assertReindexOf(admin); @@ -1304,7 +1304,7 @@ public class AccountIT extends AbstractDaemonTest { r = push.to(MagicBranch.NEW_CHANGE + RefNames.REFS_USERS_SELF); r.assertOkStatus(); accountIndexedCounter.assertNoReindex(); - assertThat(r.getChange().change().getDest().get()).isEqualTo(userRefName); + assertThat(r.getChange().change().getDest().branch()).isEqualTo(userRefName); gApi.changes().id(r.getChangeId()).current().review(ReviewInput.approve()); gApi.changes().id(r.getChangeId()).current().submit(); accountIndexedCounter.assertReindexOf(admin); @@ -1331,7 +1331,7 @@ public class AccountIT extends AbstractDaemonTest { .to(MagicBranch.NEW_CHANGE + userRef); r.assertOkStatus(); accountIndexedCounter.assertNoReindex(); - assertThat(r.getChange().change().getDest().get()).isEqualTo(userRef); + assertThat(r.getChange().change().getDest().branch()).isEqualTo(userRef); gApi.changes().id(r.getChangeId()).current().review(ReviewInput.approve()); gApi.changes().id(r.getChangeId()).current().submit(); @@ -1369,7 +1369,7 @@ public class AccountIT extends AbstractDaemonTest { .to(MagicBranch.NEW_CHANGE + userRef); r.assertOkStatus(); accountIndexedCounter.assertNoReindex(); - assertThat(r.getChange().change().getDest().get()).isEqualTo(userRef); + assertThat(r.getChange().change().getDest().branch()).isEqualTo(userRef); requestScopeOperations.setApiUser(foo.id()); gApi.changes().id(r.getChangeId()).current().review(ReviewInput.approve()); @@ -1401,7 +1401,7 @@ public class AccountIT extends AbstractDaemonTest { .to(MagicBranch.NEW_CHANGE + userRef); r.assertOkStatus(); accountIndexedCounter.assertNoReindex(); - assertThat(r.getChange().change().getDest().get()).isEqualTo(userRef); + assertThat(r.getChange().change().getDest().branch()).isEqualTo(userRef); gApi.changes().id(r.getChangeId()).current().review(ReviewInput.approve()); exception.expect(ResourceConflictException.class); @@ -1440,7 +1440,7 @@ public class AccountIT extends AbstractDaemonTest { .to(MagicBranch.NEW_CHANGE + userRef); r.assertOkStatus(); accountIndexedCounter.assertNoReindex(); - assertThat(r.getChange().change().getDest().get()).isEqualTo(userRef); + assertThat(r.getChange().change().getDest().branch()).isEqualTo(userRef); gApi.changes().id(r.getChangeId()).current().review(ReviewInput.approve()); exception.expect(ResourceConflictException.class); @@ -1473,7 +1473,7 @@ public class AccountIT extends AbstractDaemonTest { .to(MagicBranch.NEW_CHANGE + userRef); r.assertOkStatus(); accountIndexedCounter.assertNoReindex(); - assertThat(r.getChange().change().getDest().get()).isEqualTo(userRef); + assertThat(r.getChange().change().getDest().branch()).isEqualTo(userRef); gApi.changes().id(r.getChangeId()).current().review(ReviewInput.approve()); exception.expect(ResourceConflictException.class); @@ -1512,7 +1512,7 @@ public class AccountIT extends AbstractDaemonTest { .to(MagicBranch.NEW_CHANGE + userRef); r.assertOkStatus(); accountIndexedCounter.assertNoReindex(); - assertThat(r.getChange().change().getDest().get()).isEqualTo(userRef); + assertThat(r.getChange().change().getDest().branch()).isEqualTo(userRef); gApi.changes().id(r.getChangeId()).current().review(ReviewInput.approve()); gApi.changes().id(r.getChangeId()).current().submit(); @@ -2692,7 +2692,7 @@ public class AccountIT extends AbstractDaemonTest { @Test public void deleteDraftCommentsSkipsInvisibleChanges() throws Exception { try { - createBranch(new Branch.NameKey(project, "secret")); + createBranch(Branch.nameKey(project, "secret")); PushOneCommit.Result r1 = createChange(); PushOneCommit.Result r2 = createChange("refs/for/secret"); diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index 917532a7f6..168b059163 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -2749,7 +2749,7 @@ public class ChangeIT extends AbstractDaemonTest { "gerrit", (newCommitMessage, original, mergeTip, destination) -> { assertThat(original.getName()).isNotEqualTo(mergeTip.getName()); - return newCommitMessage + "Custom: " + destination.get(); + return newCommitMessage + "Custom: " + destination.branch(); }); ChangeInfo actual; try { @@ -4243,7 +4243,7 @@ public class ChangeIT extends AbstractDaemonTest { } private BranchApi createBranch(String branch) throws Exception { - return createBranch(new Branch.NameKey(project, branch)); + return createBranch(Branch.nameKey(project, branch)); } private ThrowableSubject assertThatQueryException(String query) throws Exception { diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java index b37c61184d..8ceb91fa73 100644 --- a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java +++ b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java @@ -1424,7 +1424,7 @@ public class GroupsIT extends AbstractDaemonTest { .create(admin.newIdent(), repo, "Update group config", "group.config", "some content") .to(MagicBranch.NEW_CHANGE + groupRef); r.assertOkStatus(); - assertThat(r.getChange().change().getDest().get()).isEqualTo(groupRef); + assertThat(r.getChange().change().getDest().branch()).isEqualTo(groupRef); gApi.changes().id(r.getChangeId()).current().review(ReviewInput.approve()); if (expectedError != null) { diff --git a/javatests/com/google/gerrit/acceptance/api/project/CheckProjectIT.java b/javatests/com/google/gerrit/acceptance/api/project/CheckProjectIT.java index 388ea30a1d..bf82603c0e 100644 --- a/javatests/com/google/gerrit/acceptance/api/project/CheckProjectIT.java +++ b/javatests/com/google/gerrit/acceptance/api/project/CheckProjectIT.java @@ -50,7 +50,7 @@ public class CheckProjectIT extends AbstractDaemonTest { @Test public void noProblem() throws Exception { PushOneCommit.Result r = createChange("refs/for/master"); - String branch = r.getChange().change().getDest().get(); + String branch = r.getChange().change().getDest().branch(); ChangeInfo info = gApi.changes().id(r.getChange().getId().get()).info(); assertThat(info.status).isEqualTo(ChangeStatus.NEW); @@ -115,7 +115,7 @@ public class CheckProjectIT extends AbstractDaemonTest { @Test public void detectAutoCloseableChangeByChangeId() throws Exception { PushOneCommit.Result r = createChange("refs/for/master"); - String branch = r.getChange().change().getDest().get(); + String branch = r.getChange().change().getDest().branch(); RevCommit amendedCommit = serverSideTestRepo.amend(r.getCommit()).create(); serverSideTestRepo.branch(branch).update(amendedCommit); @@ -138,7 +138,7 @@ public class CheckProjectIT extends AbstractDaemonTest { @Test public void fixAutoCloseableChangeByChangeId() throws Exception { PushOneCommit.Result r = createChange("refs/for/master"); - String branch = r.getChange().change().getDest().get(); + String branch = r.getChange().change().getDest().branch(); RevCommit amendedCommit = serverSideTestRepo.amend(r.getCommit()).create(); serverSideTestRepo.branch(branch).update(amendedCommit); @@ -162,7 +162,7 @@ public class CheckProjectIT extends AbstractDaemonTest { @Test public void maxCommits() throws Exception { PushOneCommit.Result r = createChange("refs/for/master"); - String branch = r.getChange().change().getDest().get(); + String branch = r.getChange().change().getDest().branch(); RevCommit amendedCommit = serverSideTestRepo.amend(r.getCommit()).create(); serverSideTestRepo.branch(branch).update(amendedCommit); @@ -196,7 +196,7 @@ public class CheckProjectIT extends AbstractDaemonTest { @Test public void skipCommits() throws Exception { PushOneCommit.Result r = createChange("refs/for/master"); - String branch = r.getChange().change().getDest().get(); + String branch = r.getChange().change().getDest().branch(); RevCommit amendedCommit = serverSideTestRepo.amend(r.getCommit()).create(); serverSideTestRepo.branch(branch).update(amendedCommit); diff --git a/javatests/com/google/gerrit/acceptance/api/project/CommitIncludedInIT.java b/javatests/com/google/gerrit/acceptance/api/project/CommitIncludedInIT.java index 4b5fe1e9f8..7009411baf 100644 --- a/javatests/com/google/gerrit/acceptance/api/project/CommitIncludedInIT.java +++ b/javatests/com/google/gerrit/acceptance/api/project/CommitIncludedInIT.java @@ -54,7 +54,7 @@ public class CommitIncludedInIT extends AbstractDaemonTest { assertThat(getIncludedIn(result.getCommit().getId()).tags).containsExactly("test-tag"); - createBranch(new Branch.NameKey(project.get(), "test-branch")); + createBranch(Branch.nameKey(project, "test-branch")); assertThat(getIncludedIn(result.getCommit().getId()).branches) .containsExactly("master", "test-branch"); diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java index cdaf837f84..a2092af069 100644 --- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java +++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java @@ -627,7 +627,7 @@ public class RevisionIT extends AbstractDaemonTest { createCherryPickableMerge(parent1FileName, parent2FileName); String cherryPickBranchName = "branch_for_cherry_pick"; - createBranch(new Branch.NameKey(project, cherryPickBranchName)); + createBranch(Branch.nameKey(project, cherryPickBranchName)); CherryPickInput cherryPickInput = new CherryPickInput(); cherryPickInput.destination = cherryPickBranchName; @@ -654,7 +654,7 @@ public class RevisionIT extends AbstractDaemonTest { createCherryPickableMerge(parent1FileName, parent2FileName); String cherryPickBranchName = "branch_for_cherry_pick"; - createBranch(new Branch.NameKey(project, cherryPickBranchName)); + createBranch(Branch.nameKey(project, cherryPickBranchName)); CherryPickInput cherryPickInput = new CherryPickInput(); cherryPickInput.destination = cherryPickBranchName; @@ -682,7 +682,7 @@ public class RevisionIT extends AbstractDaemonTest { createCherryPickableMerge(parent1FileName, parent2FileName); String cherryPickBranchName = "branch_for_cherry_pick"; - createBranch(new Branch.NameKey(project, cherryPickBranchName)); + createBranch(Branch.nameKey(project, cherryPickBranchName)); CherryPickInput cherryPickInput = new CherryPickInput(); cherryPickInput.destination = cherryPickBranchName; @@ -703,7 +703,7 @@ public class RevisionIT extends AbstractDaemonTest { createCherryPickableMerge(parent1FileName, parent2FileName); String cherryPickBranchName = "branch_for_cherry_pick"; - createBranch(new Branch.NameKey(project, cherryPickBranchName)); + createBranch(Branch.nameKey(project, cherryPickBranchName)); CherryPickInput cherryPickInput = new CherryPickInput(); cherryPickInput.destination = cherryPickBranchName; @@ -718,9 +718,9 @@ public class RevisionIT extends AbstractDaemonTest { @Test public void cherryPickNotify() throws Exception { - createBranch(new Branch.NameKey(project, "branch-1")); - createBranch(new Branch.NameKey(project, "branch-2")); - createBranch(new Branch.NameKey(project, "branch-3")); + createBranch(Branch.nameKey(project, "branch-1")); + createBranch(Branch.nameKey(project, "branch-2")); + createBranch(Branch.nameKey(project, "branch-3")); // Creates a change for 'admin'. PushOneCommit.Result result = createChange(); @@ -759,7 +759,7 @@ public class RevisionIT extends AbstractDaemonTest { @Test public void cherryPickKeepReviewers() throws Exception { - createBranch(new Branch.NameKey(project, "stable")); + createBranch(Branch.nameKey(project, "stable")); // Change is created by 'admin'. PushOneCommit.Result r = createChange(); @@ -793,7 +793,7 @@ public class RevisionIT extends AbstractDaemonTest { @Test public void cherryPickToMergedChangeRevision() throws Exception { - createBranch(new Branch.NameKey(project, "foo")); + createBranch(Branch.nameKey(project, "foo")); PushOneCommit.Result dstChange = createChange(testRepo, "foo", SUBJECT, "b.txt", "b", "t"); dstChange.assertOkStatus(); @@ -817,7 +817,7 @@ public class RevisionIT extends AbstractDaemonTest { @Test public void cherryPickToOpenChangeRevision() throws Exception { - createBranch(new Branch.NameKey(project, "foo")); + createBranch(Branch.nameKey(project, "foo")); PushOneCommit.Result dstChange = createChange(testRepo, "foo", SUBJECT, "b.txt", "b", "t"); dstChange.assertOkStatus(); @@ -835,7 +835,7 @@ public class RevisionIT extends AbstractDaemonTest { @Test public void cherryPickToNonVisibleChangeFails() throws Exception { - createBranch(new Branch.NameKey(project, "foo")); + createBranch(Branch.nameKey(project, "foo")); PushOneCommit.Result dstChange = createChange(testRepo, "foo", SUBJECT, "b.txt", "b", "t"); dstChange.assertOkStatus(); @@ -1525,9 +1525,9 @@ public class RevisionIT extends AbstractDaemonTest { RevCommit initialCommit = getHead(repo(), "HEAD"); String branchAName = "branchA"; - createBranch(new Branch.NameKey(project, branchAName)); + createBranch(Branch.nameKey(project, branchAName)); String branchBName = "branchB"; - createBranch(new Branch.NameKey(project, branchBName)); + createBranch(Branch.nameKey(project, branchBName)); PushOneCommit.Result changeAResult = pushFactory diff --git a/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java b/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java index 759a99ad73..c488ed0f38 100644 --- a/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java +++ b/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java @@ -193,7 +193,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest { assertCommit(project, other); for (ChangeData c : queryProvider.get().byKey(new Change.Key(r.getChangeId()))) { - if (c.change().getDest().get().equals(other)) { + if (c.change().getDest().branch().equals(other)) { assertThat(c.change().isMerged()).isTrue(); } } diff --git a/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java b/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java index dc84d13fc6..f09381d296 100644 --- a/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java +++ b/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java @@ -152,8 +152,8 @@ public class SubmoduleSubscriptionsWholeTopicMergeIT extends AbstractSubmoduleSu // As the submodules have changed commits, the superproject tree will be // different, so we cannot directly compare the trees here, so make // assumptions only about the changed branches: - assertThat(preview).containsKey(new Branch.NameKey(superKey, "refs/heads/master")); - assertThat(preview).containsKey(new Branch.NameKey(subKey, "refs/heads/master")); + assertThat(preview).containsKey(Branch.nameKey(superKey, "refs/heads/master")); + assertThat(preview).containsKey(Branch.nameKey(subKey, "refs/heads/master")); if ((getSubmitType() == SubmitType.CHERRY_PICK) || (getSubmitType() == SubmitType.REBASE_ALWAYS)) { diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java index 0fadd4033e..3bad8094c6 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java @@ -280,7 +280,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { expected.put(project.get(), new HashMap<>()); expected.get(project.get()).put("refs/heads/master", 3); - assertThat(actual).containsKey(new Branch.NameKey(project, "refs/heads/master")); + assertThat(actual).containsKey(Branch.nameKey(project, "refs/heads/master")); if (getSubmitType() == SubmitType.CHERRY_PICK) { // CherryPick ignores dependencies, thus only change and destination // branch refs are modified. @@ -545,7 +545,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { PushOneCommit.Result visible = createChange("refs/for/master/" + name("topic")); Change.Id num = visible.getChange().getId(); - createBranch(new Branch.NameKey(project, "hidden")); + createBranch(Branch.nameKey(project, "hidden")); PushOneCommit.Result hidden = createChange("refs/for/hidden/" + name("topic")); approve(hidden.getChangeId()); blockRead("refs/heads/hidden"); diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java index c12adfaf7f..7ee4e56dd2 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java @@ -287,7 +287,7 @@ public abstract class AbstractSubmitByRebase extends AbstractSubmit { PushOneCommit.Result change2 = createChange(); approve(change2.getChangeId()); Project.NameKey project = change2.getChange().change().getProject(); - Branch.NameKey branch = new Branch.NameKey(project, "branch"); + Branch.NameKey branch = Branch.nameKey(project, "branch"); createBranchWithRevision(branch, change2.getCommit().getName()); gApi.changes().id(change2.getChangeId()).current().submit(); assertMerged(change2.getChangeId()); diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeIncludedInIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeIncludedInIT.java index 59b6e29293..d7d359ee41 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeIncludedInIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeIncludedInIT.java @@ -55,7 +55,7 @@ public class ChangeIncludedInIT extends AbstractDaemonTest { assertThat(gApi.changes().id(result.getChangeId()).includedIn().tags) .containsExactly("test-tag"); - createBranch(new Branch.NameKey(project.get(), "test-branch")); + createBranch(Branch.nameKey(project, "test-branch")); assertThat(gApi.changes().id(result.getChangeId()).includedIn().branches) .containsExactly("master", "test-branch"); diff --git a/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java index 2a8293f364..0629f6b285 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java @@ -449,7 +449,7 @@ public class CreateChangeIT extends AbstractDaemonTest { @Test public void createChangeOnExistingBranchNotPermitted() throws Exception { - createBranch(new Branch.NameKey(project, "foo")); + createBranch(Branch.nameKey(project, "foo")); blockRead("refs/heads/*"); requestScopeOperations.setApiUser(user.id()); ChangeInput input = newChangeInput(ChangeStatus.NEW); @@ -568,8 +568,8 @@ public class CreateChangeIT extends AbstractDaemonTest { initialCommit.assertOkStatus(); // create two new branches - createBranch(new Branch.NameKey(project, branchA)); - createBranch(new Branch.NameKey(project, branchB)); + createBranch(Branch.nameKey(project, branchA)); + createBranch(Branch.nameKey(project, branchB)); // create a commit in branchA Result changeA = diff --git a/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java index 2448ff881c..2dc265858f 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java @@ -54,9 +54,9 @@ public class MoveChangeIT extends AbstractDaemonTest { public void moveChangeWithShortRef() throws Exception { // Move change to a different branch using short ref name PushOneCommit.Result r = createChange(); - Branch.NameKey newBranch = new Branch.NameKey(r.getChange().change().getProject(), "moveTest"); + Branch.NameKey newBranch = Branch.nameKey(r.getChange().change().getProject(), "moveTest"); createBranch(newBranch); - move(r.getChangeId(), newBranch.getShortName()); + move(r.getChangeId(), newBranch.shortName()); assertThat(r.getChange().change().getDest()).isEqualTo(newBranch); } @@ -64,9 +64,9 @@ public class MoveChangeIT extends AbstractDaemonTest { public void moveChangeWithFullRef() throws Exception { // Move change to a different branch using full ref name PushOneCommit.Result r = createChange(); - Branch.NameKey newBranch = new Branch.NameKey(r.getChange().change().getProject(), "moveTest"); + Branch.NameKey newBranch = Branch.nameKey(r.getChange().change().getProject(), "moveTest"); createBranch(newBranch); - move(r.getChangeId(), newBranch.get()); + move(r.getChangeId(), newBranch.branch()); assertThat(r.getChange().change().getDest()).isEqualTo(newBranch); } @@ -74,10 +74,10 @@ public class MoveChangeIT extends AbstractDaemonTest { public void moveChangeWithMessage() throws Exception { // Provide a message using --message flag PushOneCommit.Result r = createChange(); - Branch.NameKey newBranch = new Branch.NameKey(r.getChange().change().getProject(), "moveTest"); + Branch.NameKey newBranch = Branch.nameKey(r.getChange().change().getProject(), "moveTest"); createBranch(newBranch); String moveMessage = "Moving for the move test"; - move(r.getChangeId(), newBranch.get(), moveMessage); + move(r.getChangeId(), newBranch.branch(), moveMessage); assertThat(r.getChange().change().getDest()).isEqualTo(newBranch); StringBuilder expectedMessage = new StringBuilder(); expectedMessage.append("Change destination moved from master to moveTest"); @@ -92,24 +92,24 @@ public class MoveChangeIT extends AbstractDaemonTest { PushOneCommit.Result r = createChange(); exception.expect(ResourceConflictException.class); exception.expectMessage("Change is already destined for the specified branch"); - move(r.getChangeId(), r.getChange().change().getDest().get()); + move(r.getChangeId(), r.getChange().change().getDest().branch()); } @Test public void moveChangeToSameChangeId() throws Exception { // Move change to a branch with existing change with same change ID PushOneCommit.Result r = createChange(); - Branch.NameKey newBranch = new Branch.NameKey(r.getChange().change().getProject(), "moveTest"); + Branch.NameKey newBranch = Branch.nameKey(r.getChange().change().getProject(), "moveTest"); createBranch(newBranch); int changeNum = r.getChange().change().getChangeId(); - createChange(newBranch.get(), r.getChangeId()); + createChange(newBranch.branch(), r.getChangeId()); exception.expect(ResourceConflictException.class); exception.expectMessage( "Destination " - + newBranch.getShortName() + + newBranch.shortName() + " has a different change with same change key " + r.getChangeId()); - move(changeNum, newBranch.get()); + move(changeNum, newBranch.branch()); } @Test @@ -117,22 +117,22 @@ public class MoveChangeIT extends AbstractDaemonTest { // Move change to a non-existing branch PushOneCommit.Result r = createChange(); Branch.NameKey newBranch = - new Branch.NameKey(r.getChange().change().getProject(), "does_not_exist"); + Branch.nameKey(r.getChange().change().getProject(), "does_not_exist"); exception.expect(ResourceConflictException.class); - exception.expectMessage("Destination " + newBranch.get() + " not found in the project"); - move(r.getChangeId(), newBranch.get()); + exception.expectMessage("Destination " + newBranch.branch() + " not found in the project"); + move(r.getChangeId(), newBranch.branch()); } @Test public void moveClosedChange() throws Exception { // Move a change which is not open PushOneCommit.Result r = createChange(); - Branch.NameKey newBranch = new Branch.NameKey(r.getChange().change().getProject(), "moveTest"); + Branch.NameKey newBranch = Branch.nameKey(r.getChange().change().getProject(), "moveTest"); createBranch(newBranch); merge(r); exception.expect(ResourceConflictException.class); exception.expectMessage("Change is merged"); - move(r.getChangeId(), newBranch.get()); + move(r.getChangeId(), newBranch.branch()); } @Test @@ -153,11 +153,11 @@ public class MoveChangeIT extends AbstractDaemonTest { pushHead(testRepo, "refs/for/master", false, false); // Try to move the merge commit to another branch - Branch.NameKey newBranch = new Branch.NameKey(r1.getChange().change().getProject(), "moveTest"); + Branch.NameKey newBranch = Branch.nameKey(r1.getChange().change().getProject(), "moveTest"); createBranch(newBranch); exception.expect(ResourceConflictException.class); exception.expectMessage("Merge commit cannot be moved"); - move(GitUtil.getChangeId(testRepo, c).get(), newBranch.get()); + move(GitUtil.getChangeId(testRepo, c).get(), newBranch.branch()); } @Test @@ -165,31 +165,31 @@ public class MoveChangeIT extends AbstractDaemonTest { // Move change to a destination where user doesn't have upload permissions PushOneCommit.Result r = createChange(); Branch.NameKey newBranch = - new Branch.NameKey(r.getChange().change().getProject(), "blocked_branch"); + Branch.nameKey(r.getChange().change().getProject(), "blocked_branch"); createBranch(newBranch); block( - "refs/for/" + newBranch.get(), + "refs/for/" + newBranch.branch(), Permission.PUSH, systemGroupBackend.getGroup(REGISTERED_USERS).getUUID()); exception.expect(AuthException.class); exception.expectMessage("move not permitted"); - move(r.getChangeId(), newBranch.get()); + move(r.getChangeId(), newBranch.branch()); } @Test public void moveChangeFromBranchWithoutAbandonPerms() throws Exception { // Move change for which user does not have abandon permissions PushOneCommit.Result r = createChange(); - Branch.NameKey newBranch = new Branch.NameKey(r.getChange().change().getProject(), "moveTest"); + Branch.NameKey newBranch = Branch.nameKey(r.getChange().change().getProject(), "moveTest"); createBranch(newBranch); block( - r.getChange().change().getDest().get(), + r.getChange().change().getDest().branch(), Permission.ABANDON, systemGroupBackend.getGroup(REGISTERED_USERS).getUUID()); requestScopeOperations.setApiUser(user.id()); exception.expect(AuthException.class); exception.expectMessage("move not permitted"); - move(r.getChangeId(), newBranch.get()); + move(r.getChangeId(), newBranch.branch()); } @Test @@ -202,23 +202,23 @@ public class MoveChangeIT extends AbstractDaemonTest { int changeNum = r.getChange().change().getChangeId(); // Create a branch with that same commit - Branch.NameKey newBranch = new Branch.NameKey(r.getChange().change().getProject(), "moveTest"); + Branch.NameKey newBranch = Branch.nameKey(r.getChange().change().getProject(), "moveTest"); BranchInput bi = new BranchInput(); bi.revision = r.getCommit().name(); - gApi.projects().name(newBranch.getParentKey().get()).branch(newBranch.get()).create(bi); + gApi.projects().name(newBranch.project().get()).branch(newBranch.branch()).create(bi); // Try to move the change to the branch with the same commit exception.expect(ResourceConflictException.class); exception.expectMessage( - "Current patchset revision is reachable from tip of " + newBranch.get()); - move(changeNum, newBranch.get()); + "Current patchset revision is reachable from tip of " + newBranch.branch()); + move(changeNum, newBranch.branch()); } @Test public void moveChangeWithCurrentPatchSetLocked() throws Exception { // Move change that is locked PushOneCommit.Result r = createChange(); - Branch.NameKey newBranch = new Branch.NameKey(r.getChange().change().getProject(), "moveTest"); + Branch.NameKey newBranch = Branch.nameKey(r.getChange().change().getProject(), "moveTest"); createBranch(newBranch); try (ProjectConfigUpdate u = updateProject(project)) { @@ -240,14 +240,14 @@ public class MoveChangeIT extends AbstractDaemonTest { exception.expect(ResourceConflictException.class); exception.expectMessage( String.format("The current patch set of change %s is locked", r.getChange().getId())); - move(r.getChangeId(), newBranch.get()); + move(r.getChangeId(), newBranch.branch()); } @Test public void moveChangeOnlyKeepVetoVotes() throws Exception { // A vote for a label will be kept after moving if the label's function is *WithBlock and the // vote holds the minimum value. - createBranch(new Branch.NameKey(project, "foo")); + createBranch(Branch.nameKey(project, "foo")); String codeReviewLabel = "Code-Review"; // 'Code-Review' uses 'MaxWithBlock' function. String testLabelA = "Label-A"; @@ -302,7 +302,7 @@ public class MoveChangeIT extends AbstractDaemonTest { @Test public void moveToBranchWithoutLabel() throws Exception { - createBranch(new Branch.NameKey(project, "foo")); + createBranch(Branch.nameKey(project, "foo")); String testLabelA = "Label-A"; configLabel(testLabelA, LabelFunction.MAX_WITH_BLOCK, Arrays.asList("refs/heads/master")); diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java index 2ad4acabc6..d32105682e 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java @@ -91,7 +91,7 @@ public class SubmitByCherryPickIT extends AbstractSubmit { changeMessageModifiers.add( "gerrit", (newCommitMessage, original, mergeTip, destination) -> - newCommitMessage + "Custom: " + destination.get()); + newCommitMessage + "Custom: " + destination.branch()); try { submit(change.getChangeId()); } finally { diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java index 5ebcd85ae3..42ed4afeb3 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java @@ -196,19 +196,19 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge { // check that the preview matched what happened: assertThat(preview).hasSize(3); - assertThat(preview).containsKey(new Branch.NameKey(p1, "refs/heads/master")); + assertThat(preview).containsKey(Branch.nameKey(p1, "refs/heads/master")); assertTrees(p1, preview); - assertThat(preview).containsKey(new Branch.NameKey(p2, "refs/heads/master")); + assertThat(preview).containsKey(Branch.nameKey(p2, "refs/heads/master")); assertTrees(p2, preview); - assertThat(preview).containsKey(new Branch.NameKey(p3, "refs/heads/master")); + assertThat(preview).containsKey(Branch.nameKey(p3, "refs/heads/master")); assertTrees(p3, preview); } else { assertThat(tip2.getShortMessage()).isEqualTo(initialHead2.getShortMessage()); assertThat(tip3.getShortMessage()).isEqualTo(initialHead3.getShortMessage()); assertThat(preview).hasSize(1); - assertThat(preview.get(new Branch.NameKey(p1, "refs/heads/master"))).isNotNull(); + assertThat(preview.get(Branch.nameKey(p1, "refs/heads/master"))).isNotNull(); } } @@ -624,13 +624,13 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge { // Move the first change to a destination branch that is non-visible to user so that user cannot // this change anymore. - Branch.NameKey secretBranch = new Branch.NameKey(project, "secretBranch"); + Branch.NameKey secretBranch = Branch.nameKey(project, "secretBranch"); gApi.projects() - .name(secretBranch.getParentKey().get()) - .branch(secretBranch.get()) + .name(secretBranch.project().get()) + .branch(secretBranch.branch()) .create(new BranchInput()); - gApi.changes().id(changeResult.getChangeId()).move(secretBranch.get()); - block(secretBranch.get(), "read", ANONYMOUS_USERS); + gApi.changes().id(changeResult.getChangeId()).move(secretBranch.branch()); + block(secretBranch.branch(), "read", ANONYMOUS_USERS); requestScopeOperations.setApiUser(user.id()); diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java index eb8dea572d..303a85a3e5 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java @@ -95,7 +95,7 @@ public class SubmitByRebaseAlwaysIT extends AbstractSubmitByRebase { ChangeMessageModifier modifier2 = (msg, orig, tip, dest) -> msg + "Previous-step-tip: " + tip.name() + "\n"; ChangeMessageModifier modifier3 = - (msg, orig, tip, dest) -> msg + "Dest: " + dest.getShortName() + "\n"; + (msg, orig, tip, dest) -> msg + "Dest: " + dest.shortName() + "\n"; try (AutoCloseable ignored = installChangeMessageModifiers(modifier1, modifier2, modifier3)) { ImmutableList changes = submitWithRebase(admin); diff --git a/javatests/com/google/gerrit/acceptance/rest/project/CheckMergeabilityIT.java b/javatests/com/google/gerrit/acceptance/rest/project/CheckMergeabilityIT.java index 7667fc0c9f..e2244f7ce0 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/CheckMergeabilityIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/CheckMergeabilityIT.java @@ -38,11 +38,8 @@ public class CheckMergeabilityIT extends AbstractDaemonTest { @Before public void setUp() throws Exception { - branch = new Branch.NameKey(project, "test"); - gApi.projects() - .name(branch.getParentKey().get()) - .branch(branch.get()) - .create(new BranchInput()); + branch = Branch.nameKey(project, "test"); + gApi.projects().name(branch.project().get()).branch(branch.branch()).create(new BranchInput()); } @Test diff --git a/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java b/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java index c0d09d7ef0..9214ce2f32 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java @@ -45,7 +45,7 @@ public class CreateBranchIT extends AbstractDaemonTest { @Before public void setUp() throws Exception { - testBranch = new Branch.NameKey(project, "test"); + testBranch = Branch.nameKey(project, "test"); } @Test @@ -104,7 +104,7 @@ public class CreateBranchIT extends AbstractDaemonTest { String metaRef = RefNames.REFS_META + "foo"; allow(metaRef, Permission.CREATE, REGISTERED_USERS); allow(metaRef, Permission.PUSH, REGISTERED_USERS); - assertCreateSucceeds(new Branch.NameKey(project, metaRef)); + assertCreateSucceeds(Branch.nameKey(project, metaRef)); } @Test @@ -112,7 +112,7 @@ public class CreateBranchIT extends AbstractDaemonTest { allow(allUsers, RefNames.REFS_USERS + "*", Permission.CREATE, REGISTERED_USERS); allow(allUsers, RefNames.REFS_USERS + "*", Permission.PUSH, REGISTERED_USERS); assertCreateFails( - new Branch.NameKey(allUsers, RefNames.refsUsers(Account.id(1))), + Branch.nameKey(allUsers, RefNames.refsUsers(Account.id(1))), RefNames.refsUsers(admin.id()), ResourceConflictException.class, "Not allowed to create user branch."); @@ -123,7 +123,7 @@ public class CreateBranchIT extends AbstractDaemonTest { allow(allUsers, RefNames.REFS_GROUPS + "*", Permission.CREATE, REGISTERED_USERS); allow(allUsers, RefNames.REFS_GROUPS + "*", Permission.PUSH, REGISTERED_USERS); assertCreateFails( - new Branch.NameKey(allUsers, RefNames.refsGroups(AccountGroup.uuid("foo"))), + Branch.nameKey(allUsers, RefNames.refsGroups(AccountGroup.uuid("foo"))), RefNames.refsGroups(adminGroupUuid()), ResourceConflictException.class, "Not allowed to create group branch."); @@ -138,12 +138,12 @@ public class CreateBranchIT extends AbstractDaemonTest { } private BranchApi branch(Branch.NameKey branch) throws Exception { - return gApi.projects().name(branch.getParentKey().get()).branch(branch.get()); + return gApi.projects().name(branch.project().get()).branch(branch.branch()); } private void assertCreateSucceeds(Branch.NameKey branch) throws Exception { BranchInfo created = branch(branch).create(new BranchInput()).get(); - assertThat(created.ref).isEqualTo(branch.get()); + assertThat(created.ref).isEqualTo(branch.branch()); } private void assertCreateFails( diff --git a/javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java b/javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java index 8c966625c7..a5fd830d9c 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java @@ -45,7 +45,7 @@ public class DeleteBranchIT extends AbstractDaemonTest { @Before public void setUp() throws Exception { project = projectOperations.newProject().create(); - testBranch = new Branch.NameKey(project, "test"); + testBranch = Branch.nameKey(project, "test"); branch(testBranch).create(new BranchInput()); } @@ -98,7 +98,7 @@ public class DeleteBranchIT extends AbstractDaemonTest { @Test public void deleteBranchByRestWithoutRefsHeadsPrefix() throws Exception { grantDelete(); - String ref = testBranch.getShortName(); + String ref = testBranch.shortName(); assertThat(ref).doesNotMatch(R_HEADS); assertDeleteByRestSucceeds(testBranch, ref); } @@ -106,14 +106,14 @@ public class DeleteBranchIT extends AbstractDaemonTest { @Test public void deleteBranchByRestWithFullName() throws Exception { grantDelete(); - assertDeleteByRestSucceeds(testBranch, testBranch.get()); + assertDeleteByRestSucceeds(testBranch, testBranch.branch()); } @Test public void deleteBranchByRestFailsWithUnencodedFullName() throws Exception { grantDelete(); RestResponse r = - userRestSession.delete("/projects/" + project.get() + "/branches/" + testBranch.get()); + userRestSession.delete("/projects/" + project.get() + "/branches/" + testBranch.branch()); r.assertNotFound(); branch(testBranch).get(); } @@ -124,7 +124,7 @@ public class DeleteBranchIT extends AbstractDaemonTest { allow(metaRef, Permission.CREATE, REGISTERED_USERS); allow(metaRef, Permission.PUSH, REGISTERED_USERS); - Branch.NameKey metaBranch = new Branch.NameKey(project, metaRef); + Branch.NameKey metaBranch = Branch.nameKey(project, metaRef); branch(metaBranch).create(new BranchInput()); grantDelete(); @@ -138,7 +138,7 @@ public class DeleteBranchIT extends AbstractDaemonTest { exception.expect(ResourceConflictException.class); exception.expectMessage("Not allowed to delete user branch."); - branch(new Branch.NameKey(allUsers, RefNames.refsUsers(admin.id()))).delete(); + branch(Branch.nameKey(allUsers, RefNames.refsUsers(admin.id()))).delete(); } @Test @@ -148,7 +148,7 @@ public class DeleteBranchIT extends AbstractDaemonTest { exception.expect(ResourceConflictException.class); exception.expectMessage("Not allowed to delete group branch."); - branch(new Branch.NameKey(allUsers, RefNames.refsGroups(adminGroupUuid()))).delete(); + branch(Branch.nameKey(allUsers, RefNames.refsGroups(adminGroupUuid()))).delete(); } private void blockForcePush() throws Exception { @@ -168,7 +168,7 @@ public class DeleteBranchIT extends AbstractDaemonTest { } private BranchApi branch(Branch.NameKey branch) throws Exception { - return gApi.projects().name(branch.getParentKey().get()).branch(branch.get()); + return gApi.projects().name(branch.project().get()).branch(branch.branch()); } private void assertDeleteByRestSucceeds(Branch.NameKey branch, String ref) throws Exception { @@ -188,7 +188,7 @@ public class DeleteBranchIT extends AbstractDaemonTest { String branchRev = branch(branch).get().revision; branch(branch).delete(); eventRecorder.assertRefUpdatedEvents( - project.get(), branch.get(), null, branchRev, branchRev, null); + project.get(), branch.branch(), null, branchRev, branchRev, null); exception.expect(ResourceNotFoundException.class); branch(branch).get(); } diff --git a/javatests/com/google/gerrit/acceptance/rest/project/FileBranchIT.java b/javatests/com/google/gerrit/acceptance/rest/project/FileBranchIT.java index 63f41ad34b..637b310eef 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/FileBranchIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/FileBranchIT.java @@ -33,7 +33,7 @@ public class FileBranchIT extends AbstractDaemonTest { @Before public void setUp() throws Exception { - branch = new Branch.NameKey(project, "master"); + branch = Branch.nameKey(project, "master"); PushOneCommit.Result change = createChange(); approve(change.getChangeId()); revision(change).submit(); @@ -51,6 +51,6 @@ public class FileBranchIT extends AbstractDaemonTest { } private BranchApi branch() throws Exception { - return gApi.projects().name(branch.getParentKey().get()).branch(branch.get()); + return gApi.projects().name(branch.project().get()).branch(branch.branch()); } } diff --git a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java index 7c375bd0d5..564bd8cdff 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java @@ -245,7 +245,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { + "\n" + "Patch-set: 1\n" + "Branch: " - + c.getDest().get() + + c.getDest().branch() + "\n" + "Change-id: " + c.getKey().get() @@ -341,7 +341,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { ChangeNotes notes = insertChange(); String rev = psUtil.current(notes).getRevision().get(); serverSideTestRepo - .branch(notes.getChange().getDest().get()) + .branch(notes.getChange().getDest().branch()) .update(serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev))); assertProblems( @@ -361,7 +361,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { ChangeNotes notes = insertChange(); String rev = psUtil.current(notes).getRevision().get(); serverSideTestRepo - .branch(notes.getChange().getDest().get()) + .branch(notes.getChange().getDest().branch()) .update(serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev))); assertProblems( @@ -387,7 +387,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { ChangeNotes notes = insertChange(); String rev = psUtil.current(notes).getRevision().get(); serverSideTestRepo - .branch(notes.getChange().getDest().get()) + .branch(notes.getChange().getDest().branch()) .update(serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev))); ChangeInfo info = gApi.changes().id(notes.getChangeId().get()).info(); @@ -402,7 +402,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { ChangeNotes notes = insertChange(); String rev = psUtil.current(notes).getRevision().get(); serverSideTestRepo - .branch(notes.getChange().getDest().get()) + .branch(notes.getChange().getDest().branch()) .update(serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev))); FixInput fix = new FixInput(); @@ -430,7 +430,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { ChangeNotes notes = insertChange(); String rev = psUtil.current(notes).getRevision().get(); RevCommit commit = serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev)); - serverSideTestRepo.branch(notes.getChange().getDest().get()).update(commit); + serverSideTestRepo.branch(notes.getChange().getDest().branch()).update(commit); FixInput fix = new FixInput(); RevCommit other = serverSideTestRepo.commit().message(commit.getFullMessage()).create(); @@ -450,7 +450,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void createNewPatchSetForExpectedMergeCommitWithNoChangeId() throws Exception { ChangeNotes notes = insertChange(); - String dest = notes.getChange().getDest().get(); + String dest = notes.getChange().getDest().branch(); String rev = psUtil.current(notes).getRevision().get(); RevCommit commit = serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev)); @@ -491,7 +491,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void createNewPatchSetForExpectedMergeCommitWithChangeId() throws Exception { ChangeNotes notes = insertChange(); - String dest = notes.getChange().getDest().get(); + String dest = notes.getChange().getDest().branch(); String rev = psUtil.current(notes).getRevision().get(); RevCommit commit = serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev)); @@ -544,7 +544,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { notes = incrementPatchSet(notes); PatchSet ps2 = psUtil.current(notes); serverSideTestRepo - .branch(notes.getChange().getDest().get()) + .branch(notes.getChange().getDest().branch()) .update(serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev1))); FixInput fix = new FixInput(); @@ -592,7 +592,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { assertThat(ps3.getId().get()).isEqualTo(3); serverSideTestRepo - .branch(notes.getChange().getDest().get()) + .branch(notes.getChange().getDest().branch()) .update(serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev2))); FixInput fix = new FixInput(); @@ -637,7 +637,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { serverSideTestRepo.branch(psId2.toRefName()).update(commit2); serverSideTestRepo - .branch(notes.getChange().getDest().get()) + .branch(notes.getChange().getDest().branch()) .update(serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev2))); FixInput fix = new FixInput(); @@ -664,7 +664,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Test public void expectedMergedCommitWithMismatchedChangeId() throws Exception { ChangeNotes notes = insertChange(); - String dest = notes.getChange().getDest().get(); + String dest = notes.getChange().getDest().branch(); RevCommit parent = serverSideTestRepo.branch(dest).commit().message("parent").create(); String rev = psUtil.current(notes).getRevision().get(); RevCommit commit = serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev)); @@ -701,7 +701,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { public void expectedMergedCommitMatchesMultiplePatchSets() throws Exception { ChangeNotes notes1 = insertChange(); PatchSet.Id psId1 = psUtil.current(notes1).getId(); - String dest = notes1.getChange().getDest().get(); + String dest = notes1.getChange().getDest().branch(); String rev = psUtil.current(notes1).getRevision().get(); RevCommit commit = serverSideTestRepo.getRevWalk().parseCommit(ObjectId.fromString(rev)); serverSideTestRepo.branch(dest).update(commit); @@ -842,14 +842,14 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { private ObjectId getDestRef(ChangeNotes notes) throws Exception { return serverSideTestRepo .getRepository() - .exactRef(notes.getChange().getDest().get()) + .exactRef(notes.getChange().getDest().branch()) .getObjectId(); } private ChangeNotes mergeChange(ChangeNotes notes) throws Exception { final ObjectId oldId = getDestRef(notes); final ObjectId newId = ObjectId.fromString(psUtil.current(notes).getRevision().get()); - final String dest = notes.getChange().getDest().get(); + final String dest = notes.getChange().getDest().branch(); try (BatchUpdate bu = newUpdate(adminId)) { bu.addOp( diff --git a/javatests/com/google/gerrit/acceptance/server/permissions/PermissionBackendConditionIT.java b/javatests/com/google/gerrit/acceptance/server/permissions/PermissionBackendConditionIT.java index 2919e5fe97..6a006752f0 100644 --- a/javatests/com/google/gerrit/acceptance/server/permissions/PermissionBackendConditionIT.java +++ b/javatests/com/google/gerrit/acceptance/server/permissions/PermissionBackendConditionIT.java @@ -122,7 +122,7 @@ public class PermissionBackendConditionIT extends AbstractDaemonTest { @Test public void refPermissions_sameResourceAndUserEquals() throws Exception { - Branch.NameKey branch = new Branch.NameKey(project, "branch"); + Branch.NameKey branch = Branch.nameKey(project, "branch"); BooleanCondition cond1 = pb.user(user()).ref(branch).testCond(RefPermission.READ); BooleanCondition cond2 = pb.user(user()).ref(branch).testCond(RefPermission.READ); @@ -132,7 +132,7 @@ public class PermissionBackendConditionIT extends AbstractDaemonTest { @Test public void refPermissions_sameResourceAndDifferentUserDoesNotEqual() throws Exception { - Branch.NameKey branch = new Branch.NameKey(project, "branch"); + Branch.NameKey branch = Branch.nameKey(project, "branch"); BooleanCondition cond1 = pb.user(user()).ref(branch).testCond(RefPermission.READ); BooleanCondition cond2 = pb.user(admin()).ref(branch).testCond(RefPermission.READ); @@ -142,8 +142,8 @@ public class PermissionBackendConditionIT extends AbstractDaemonTest { @Test public void refPermissions_differentResourceAndSameUserDoesNotEqual() throws Exception { - Branch.NameKey branch1 = new Branch.NameKey(project, "branch"); - Branch.NameKey branch2 = new Branch.NameKey(project, "branch2"); + Branch.NameKey branch1 = Branch.nameKey(project, "branch"); + Branch.NameKey branch2 = Branch.nameKey(project, "branch2"); BooleanCondition cond1 = pb.user(user()).ref(branch1).testCond(RefPermission.READ); BooleanCondition cond2 = pb.user(user()).ref(branch2).testCond(RefPermission.READ); @@ -153,8 +153,8 @@ public class PermissionBackendConditionIT extends AbstractDaemonTest { @Test public void refPermissions_differentResourceAndSameUserDoesNotEqual2() throws Exception { - Branch.NameKey branch1 = new Branch.NameKey(project, "branch"); - Branch.NameKey branch2 = new Branch.NameKey(projectOperations.newProject().create(), "branch"); + Branch.NameKey branch1 = Branch.nameKey(project, "branch"); + Branch.NameKey branch2 = Branch.nameKey(projectOperations.newProject().create(), "branch"); BooleanCondition cond1 = pb.user(user()).ref(branch1).testCond(RefPermission.READ); BooleanCondition cond2 = pb.user(user()).ref(branch2).testCond(RefPermission.READ); diff --git a/javatests/com/google/gerrit/reviewdb/client/BranchTest.java b/javatests/com/google/gerrit/reviewdb/client/BranchTest.java index 7b0c31d8e0..334e7ac8e9 100644 --- a/javatests/com/google/gerrit/reviewdb/client/BranchTest.java +++ b/javatests/com/google/gerrit/reviewdb/client/BranchTest.java @@ -21,19 +21,19 @@ import org.junit.Test; public class BranchTest { @Test public void canonicalizeNameDuringConstruction() { - assertThat(new Branch.NameKey(new Project.NameKey("foo"), "bar").get()) + assertThat(Branch.nameKey(new Project.NameKey("foo"), "bar").branch()) .isEqualTo("refs/heads/bar"); - assertThat(new Branch.NameKey(new Project.NameKey("foo"), "refs/heads/bar").get()) + assertThat(Branch.nameKey(new Project.NameKey("foo"), "refs/heads/bar").branch()) .isEqualTo("refs/heads/bar"); } @Test public void idToString() { - assertThat(new Branch.NameKey(new Project.NameKey("foo"), "bar").toString()) + assertThat(Branch.nameKey(new Project.NameKey("foo"), "bar").toString()) .isEqualTo("foo,refs/heads/bar"); - assertThat(new Branch.NameKey(new Project.NameKey("foo bar"), "bar baz").toString()) + assertThat(Branch.nameKey(new Project.NameKey("foo bar"), "bar baz").toString()) .isEqualTo("foo+bar,refs/heads/bar+baz"); - assertThat(new Branch.NameKey(new Project.NameKey("foo^bar"), "bar^baz").toString()) + assertThat(Branch.nameKey(new Project.NameKey("foo^bar"), "bar^baz").toString()) .isEqualTo("foo%5Ebar,refs/heads/bar%5Ebaz"); } } diff --git a/javatests/com/google/gerrit/reviewdb/converter/BranchNameKeyProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/BranchNameKeyProtoConverterTest.java index 412641f6aa..1186d9bb3a 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/BranchNameKeyProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/BranchNameKeyProtoConverterTest.java @@ -33,21 +33,21 @@ public class BranchNameKeyProtoConverterTest { @Test public void allValuesConvertedToProto() { - Branch.NameKey nameKey = new Branch.NameKey(new Project.NameKey("project-13"), "branch-72"); + Branch.NameKey nameKey = Branch.nameKey(new Project.NameKey("project-13"), "branch-72"); Entities.Branch_NameKey proto = branchNameKeyProtoConverter.toProto(nameKey); Entities.Branch_NameKey expectedProto = Entities.Branch_NameKey.newBuilder() - .setProjectName(Entities.Project_NameKey.newBuilder().setName("project-13")) - .setBranchName("refs/heads/branch-72") + .setProject(Entities.Project_NameKey.newBuilder().setName("project-13")) + .setBranch("refs/heads/branch-72") .build(); assertThat(proto).isEqualTo(expectedProto); } @Test public void allValuesConvertedToProtoAndBackAgain() { - Branch.NameKey nameKey = new Branch.NameKey(new Project.NameKey("project-52"), "branch 14"); + Branch.NameKey nameKey = Branch.nameKey(new Project.NameKey("project-52"), "branch 14"); Branch.NameKey convertedNameKey = branchNameKeyProtoConverter.fromProto(branchNameKeyProtoConverter.toProto(nameKey)); @@ -59,8 +59,8 @@ public class BranchNameKeyProtoConverterTest { public void protoCanBeParsedFromBytes() throws Exception { Entities.Branch_NameKey proto = Entities.Branch_NameKey.newBuilder() - .setProjectName(Entities.Project_NameKey.newBuilder().setName("project 1")) - .setBranchName("branch 36") + .setProject(Entities.Project_NameKey.newBuilder().setName("project 1")) + .setBranch("branch 36") .build(); byte[] bytes = proto.toByteArray(); @@ -72,12 +72,12 @@ public class BranchNameKeyProtoConverterTest { /** See {@link SerializedClassSubject} for background and what to do if this test fails. */ @Test - public void fieldsExistAsExpected() { + public void methodsExistAsExpected() { assertThatSerializedClass(Branch.NameKey.class) - .hasFields( + .hasAutoValueMethods( ImmutableMap.builder() - .put("projectName", Project.NameKey.class) - .put("branchName", String.class) + .put("project", Project.NameKey.class) + .put("branch", String.class) .build()); } } diff --git a/javatests/com/google/gerrit/reviewdb/converter/ChangeProtoConverterTest.java b/javatests/com/google/gerrit/reviewdb/converter/ChangeProtoConverterTest.java index 477a92b0de..a1e6e4b1c4 100644 --- a/javatests/com/google/gerrit/reviewdb/converter/ChangeProtoConverterTest.java +++ b/javatests/com/google/gerrit/reviewdb/converter/ChangeProtoConverterTest.java @@ -41,7 +41,7 @@ public class ChangeProtoConverterTest { new Change.Key("change 1"), new Change.Id(14), Account.id(35), - new Branch.NameKey(new Project.NameKey("project 67"), "branch 74"), + Branch.nameKey(new Project.NameKey("project 67"), "branch 74"), new Timestamp(987654L)); change.setLastUpdatedOn(new Timestamp(1234567L)); change.setStatus(Change.Status.MERGED); @@ -67,8 +67,8 @@ public class ChangeProtoConverterTest { .setOwnerAccountId(Entities.Account_Id.newBuilder().setId(35)) .setDest( Entities.Branch_NameKey.newBuilder() - .setProjectName(Entities.Project_NameKey.newBuilder().setName("project 67")) - .setBranchName("refs/heads/branch 74")) + .setProject(Entities.Project_NameKey.newBuilder().setName("project 67")) + .setBranch("refs/heads/branch 74")) .setStatus(Change.STATUS_MERGED) .setCurrentPatchSetId(23) .setSubject("subject XYZ") @@ -91,7 +91,7 @@ public class ChangeProtoConverterTest { new Change.Key("change 1"), new Change.Id(14), Account.id(35), - new Branch.NameKey(new Project.NameKey("project 67"), "branch-74"), + Branch.nameKey(new Project.NameKey("project 67"), "branch-74"), new Timestamp(987654L)); Entities.Change proto = changeProtoConverter.toProto(change); @@ -106,8 +106,8 @@ public class ChangeProtoConverterTest { .setOwnerAccountId(Entities.Account_Id.newBuilder().setId(35)) .setDest( Entities.Branch_NameKey.newBuilder() - .setProjectName(Entities.Project_NameKey.newBuilder().setName("project 67")) - .setBranchName("refs/heads/branch-74")) + .setProject(Entities.Project_NameKey.newBuilder().setName("project 67")) + .setBranch("refs/heads/branch-74")) // Default values which can't be unset. .setCurrentPatchSetId(0) .setRowVersion(0) @@ -127,7 +127,7 @@ public class ChangeProtoConverterTest { new Change.Key("change 1"), new Change.Id(14), Account.id(35), - new Branch.NameKey(new Project.NameKey("project 67"), "branch-74"), + Branch.nameKey(new Project.NameKey("project 67"), "branch-74"), new Timestamp(987654L)); // O as ID actually means that no current patch set is present. change.setCurrentPatchSet(new PatchSet.Id(new Change.Id(14), 0), null, null); @@ -144,8 +144,8 @@ public class ChangeProtoConverterTest { .setOwnerAccountId(Entities.Account_Id.newBuilder().setId(35)) .setDest( Entities.Branch_NameKey.newBuilder() - .setProjectName(Entities.Project_NameKey.newBuilder().setName("project 67")) - .setBranchName("refs/heads/branch-74")) + .setProject(Entities.Project_NameKey.newBuilder().setName("project 67")) + .setBranch("refs/heads/branch-74")) .setCurrentPatchSetId(0) // Default values which can't be unset. .setRowVersion(0) @@ -165,7 +165,7 @@ public class ChangeProtoConverterTest { new Change.Key("change 1"), new Change.Id(14), Account.id(35), - new Branch.NameKey(new Project.NameKey("project 67"), "branch-74"), + Branch.nameKey(new Project.NameKey("project 67"), "branch-74"), new Timestamp(987654L)); change.setCurrentPatchSet(new PatchSet.Id(new Change.Id(14), 23), "subject ABC", null); @@ -181,8 +181,8 @@ public class ChangeProtoConverterTest { .setOwnerAccountId(Entities.Account_Id.newBuilder().setId(35)) .setDest( Entities.Branch_NameKey.newBuilder() - .setProjectName(Entities.Project_NameKey.newBuilder().setName("project 67")) - .setBranchName("refs/heads/branch-74")) + .setProject(Entities.Project_NameKey.newBuilder().setName("project 67")) + .setBranch("refs/heads/branch-74")) .setCurrentPatchSetId(23) .setSubject("subject ABC") // Default values which can't be unset. @@ -202,7 +202,7 @@ public class ChangeProtoConverterTest { new Change.Key("change 1"), new Change.Id(14), Account.id(35), - new Branch.NameKey(new Project.NameKey("project 67"), "branch-74"), + Branch.nameKey(new Project.NameKey("project 67"), "branch-74"), new Timestamp(987654L)); change.setLastUpdatedOn(new Timestamp(1234567L)); change.setStatus(Change.Status.MERGED); @@ -227,7 +227,7 @@ public class ChangeProtoConverterTest { new Change.Key("change 1"), new Change.Id(14), Account.id(35), - new Branch.NameKey(new Project.NameKey("project 67"), "branch-74"), + Branch.nameKey(new Project.NameKey("project 67"), "branch-74"), new Timestamp(987654L)); Change convertedChange = changeProtoConverter.fromProto(changeProtoConverter.toProto(change)); @@ -269,8 +269,8 @@ public class ChangeProtoConverterTest { .setOwnerAccountId(Entities.Account_Id.newBuilder().setId(35)) .setDest( Entities.Branch_NameKey.newBuilder() - .setProjectName(Entities.Project_NameKey.newBuilder().setName("project 67")) - .setBranchName("branch 74")) + .setProject(Entities.Project_NameKey.newBuilder().setName("project 67")) + .setBranch("branch 74")) .build(); Change change = changeProtoConverter.fromProto(proto); @@ -289,8 +289,8 @@ public class ChangeProtoConverterTest { .setOwnerAccountId(Entities.Account_Id.newBuilder().setId(35)) .setDest( Entities.Branch_NameKey.newBuilder() - .setProjectName(Entities.Project_NameKey.newBuilder().setName("project 67")) - .setBranchName("branch 74")) + .setProject(Entities.Project_NameKey.newBuilder().setName("project 67")) + .setBranch("branch 74")) .setStatus(Change.STATUS_MERGED) .setCurrentPatchSetId(23) .setSubject("subject XYZ") diff --git a/javatests/com/google/gerrit/server/account/DestinationListTest.java b/javatests/com/google/gerrit/server/account/DestinationListTest.java index e51b041569..fd8ca13729 100644 --- a/javatests/com/google/gerrit/server/account/DestinationListTest.java +++ b/javatests/com/google/gerrit/server/account/DestinationListTest.java @@ -68,7 +68,7 @@ public class DestinationListTest extends GerritBaseTests { } private static Branch.NameKey dest(String project, String ref) { - return new Branch.NameKey(new Project.NameKey(project), ref); + return Branch.nameKey(new Project.NameKey(project), ref); } @Test diff --git a/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java index 1a408c32a0..4e9c2ca86a 100644 --- a/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java +++ b/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java @@ -182,7 +182,7 @@ public abstract class AbstractChangeNotesTest extends GerritBaseTests { Change c = TestChanges.newChange(project, changeOwner.getAccountId()); ChangeUpdate u = newUpdateForNewChange(c, changeOwner); u.setChangeId(c.getKey().get()); - u.setBranch(c.getDest().get()); + u.setBranch(c.getDest().branch()); u.setWorkInProgress(workInProgress); u.commit(); return c; diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java index f73c71cc0c..cf73061c23 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java @@ -834,7 +834,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { Change c = newChange(); ChangeNotes notes = newNotes(c); - Branch.NameKey expectedBranch = new Branch.NameKey(project, "refs/heads/master"); + Branch.NameKey expectedBranch = Branch.nameKey(project, "refs/heads/master"); assertThat(notes.getChange().getDest()).isEqualTo(expectedBranch); // An update doesn't affect the branch @@ -848,8 +848,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { update = newUpdate(c, changeOwner); update.setBranch(otherBranch); update.commit(); - assertThat(newNotes(c).getChange().getDest()) - .isEqualTo(new Branch.NameKey(project, otherBranch)); + assertThat(newNotes(c).getChange().getDest()).isEqualTo(Branch.nameKey(project, otherBranch)); } @Test @@ -956,7 +955,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { c.setCurrentPatchSet(c.currentPatchSetId(), " " + trimmedSubj, c.getOriginalSubject()); ChangeUpdate update = newUpdateForNewChange(c, changeOwner); update.setChangeId(c.getKey().get()); - update.setBranch(c.getDest().get()); + update.setBranch(c.getDest().branch()); update.commit(); ChangeNotes notes = newNotes(c); @@ -968,7 +967,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { c.setCurrentPatchSet(c.currentPatchSetId(), tabSubj, c.getOriginalSubject()); update = newUpdateForNewChange(c, changeOwner); update.setChangeId(c.getKey().get()); - update.setBranch(c.getDest().get()); + update.setBranch(c.getDest().branch()); update.commit(); notes = newNotes(c); diff --git a/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java b/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java index 9e1d0c1653..24d098e2e4 100644 --- a/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java +++ b/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java @@ -311,7 +311,7 @@ public class CommitMessageOutputTest extends AbstractChangeNotesTest { c.setCurrentPatchSet(c.currentPatchSetId(), " " + c.getSubject(), c.getOriginalSubject()); ChangeUpdate update = newUpdateForNewChange(c, changeOwner); update.setChangeId(c.getKey().get()); - update.setBranch(c.getDest().get()); + update.setBranch(c.getDest().branch()); update.commit(); assertBodyEquals( @@ -332,7 +332,7 @@ public class CommitMessageOutputTest extends AbstractChangeNotesTest { c.setCurrentPatchSet(c.currentPatchSetId(), "\t\t" + c.getSubject(), c.getOriginalSubject()); update = newUpdateForNewChange(c, changeOwner); update.setChangeId(c.getKey().get()); - update.setBranch(c.getDest().get()); + update.setBranch(c.getDest().branch()); update.commit(); assertBodyEquals( diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 4bdb763abd..36f9f7eb50 100644 --- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -3371,7 +3371,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { .append(c.changeId) .append("), ") .append("dest=") - .append(new Branch.NameKey(new Project.NameKey(c.project), c.branch)) + .append(Branch.nameKey(new Project.NameKey(c.project), c.branch)) .append(", ") .append("status=") .append(c.status) diff --git a/javatests/com/google/gerrit/server/util/git/SubmoduleSectionParserTest.java b/javatests/com/google/gerrit/server/util/git/SubmoduleSectionParserTest.java index c5e683fefe..1b6f8c6cef 100644 --- a/javatests/com/google/gerrit/server/util/git/SubmoduleSectionParserTest.java +++ b/javatests/com/google/gerrit/server/util/git/SubmoduleSectionParserTest.java @@ -40,15 +40,14 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + p.get() + "\n" + "branch = master\n"); - Branch.NameKey targetBranch = new Branch.NameKey(new Project.NameKey("project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); Set expected = Sets.newHashSet( - new SubmoduleSubscription( - targetBranch, new Branch.NameKey(p, "master"), "localpath-to-a")); + new SubmoduleSubscription(targetBranch, Branch.nameKey(p, "master"), "localpath-to-a")); assertThat(res).containsExactlyElementsIn(expected); } @@ -66,25 +65,24 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + "\n" + "branch = .\n"); - Branch.NameKey targetBranch1 = new Branch.NameKey(new Project.NameKey("project"), "master"); + Branch.NameKey targetBranch1 = Branch.nameKey(new Project.NameKey("project"), "master"); Set res1 = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch1).parseAllSections(); Set expected1 = - Sets.newHashSet( - new SubmoduleSubscription(targetBranch1, new Branch.NameKey(p, "master"), "a")); + Sets.newHashSet(new SubmoduleSubscription(targetBranch1, Branch.nameKey(p, "master"), "a")); assertThat(res1).containsExactlyElementsIn(expected1); - Branch.NameKey targetBranch2 = new Branch.NameKey(new Project.NameKey("project"), "somebranch"); + Branch.NameKey targetBranch2 = Branch.nameKey(new Project.NameKey("project"), "somebranch"); Set res2 = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch2).parseAllSections(); Set expected2 = Sets.newHashSet( - new SubmoduleSubscription(targetBranch2, new Branch.NameKey(p, "somebranch"), "a")); + new SubmoduleSubscription(targetBranch2, Branch.nameKey(p, "somebranch"), "a")); assertThat(res2).containsExactlyElementsIn(expected2); } @@ -102,14 +100,14 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + "\n" + "branch = anotherbranch\n"); - Branch.NameKey targetBranch = new Branch.NameKey(new Project.NameKey("project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); Set expected = Sets.newHashSet( - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p, "anotherbranch"), "a")); + new SubmoduleSubscription(targetBranch, Branch.nameKey(p, "anotherbranch"), "a")); assertThat(res).containsExactlyElementsIn(expected); } @@ -127,14 +125,13 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + "\n" + "branch = master\n"); - Branch.NameKey targetBranch = new Branch.NameKey(new Project.NameKey("project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); Set expected = - Sets.newHashSet( - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p, "master"), "a")); + Sets.newHashSet(new SubmoduleSubscription(targetBranch, Branch.nameKey(p, "master"), "a")); assertThat(res).containsExactlyElementsIn(expected); } @@ -152,14 +149,13 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + "\n" + "branch = master\n"); - Branch.NameKey targetBranch = new Branch.NameKey(new Project.NameKey("project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); Set expected = - Sets.newHashSet( - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p, "master"), "a")); + Sets.newHashSet(new SubmoduleSubscription(targetBranch, Branch.nameKey(p, "master"), "a")); assertThat(res).containsExactlyElementsIn(expected); } @@ -177,14 +173,14 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + "\n" + "branch = master\n"); - Branch.NameKey targetBranch = new Branch.NameKey(new Project.NameKey("project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); Set expected = Sets.newHashSet( - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p, "master"), "a/b/c/d/e")); + new SubmoduleSubscription(targetBranch, Branch.nameKey(p, "master"), "a/b/c/d/e")); assertThat(res).containsExactlyElementsIn(expected); } @@ -209,15 +205,15 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + "\n" + " branch = master\n"); - Branch.NameKey targetBranch = new Branch.NameKey(new Project.NameKey("project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); Set expected = Sets.newHashSet( - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p1, "master"), "a"), - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p2, "master"), "b")); + new SubmoduleSubscription(targetBranch, Branch.nameKey(p1, "master"), "a"), + new SubmoduleSubscription(targetBranch, Branch.nameKey(p2, "master"), "b")); assertThat(res).containsExactlyElementsIn(expected); } @@ -242,15 +238,15 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + "\n" + "branch = .\n"); - Branch.NameKey targetBranch = new Branch.NameKey(new Project.NameKey("project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); Set expected = Sets.newHashSet( - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p2, "master"), "b"), - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p1, "master"), "a/b")); + new SubmoduleSubscription(targetBranch, Branch.nameKey(p2, "master"), "b"), + new SubmoduleSubscription(targetBranch, Branch.nameKey(p1, "master"), "a/b")); assertThat(res).containsExactlyElementsIn(expected); } @@ -293,15 +289,15 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + "\n" + " branch = refs/heads/master\n"); - Branch.NameKey targetBranch = new Branch.NameKey(new Project.NameKey("project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); Set expected = Sets.newHashSet( - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p1, "master"), "a"), - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p4, "master"), "e")); + new SubmoduleSubscription(targetBranch, Branch.nameKey(p1, "master"), "a"), + new SubmoduleSubscription(targetBranch, Branch.nameKey(p4, "master"), "e")); assertThat(res).containsExactlyElementsIn(expected); } @@ -317,7 +313,7 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { // Project "a" doesn't exist + "branch = .\\n"); - Branch.NameKey targetBranch = new Branch.NameKey(new Project.NameKey("project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); @@ -338,7 +334,7 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + "\n" + "branch = ."); - Branch.NameKey targetBranch = new Branch.NameKey(new Project.NameKey("project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); @@ -359,14 +355,13 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + "\n" + "branch = master\n"); - Branch.NameKey targetBranch = new Branch.NameKey(new Project.NameKey("project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); Set expected = - Sets.newHashSet( - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p1, "master"), "a")); + Sets.newHashSet(new SubmoduleSubscription(targetBranch, Branch.nameKey(p1, "master"), "a")); assertThat(res).containsExactlyElementsIn(expected); } @@ -384,15 +379,13 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + "\n" + "branch = master\n"); - Branch.NameKey targetBranch = - new Branch.NameKey(new Project.NameKey("nested/project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("nested/project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); Set expected = - Sets.newHashSet( - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p1, "master"), "a")); + Sets.newHashSet(new SubmoduleSubscription(targetBranch, Branch.nameKey(p1, "master"), "a")); assertThat(res).containsExactlyElementsIn(expected); } @@ -410,15 +403,13 @@ public class SubmoduleSectionParserTest extends GerritBaseTests { + "\n" + "branch = master\n"); - Branch.NameKey targetBranch = - new Branch.NameKey(new Project.NameKey("nested/project"), "master"); + Branch.NameKey targetBranch = Branch.nameKey(new Project.NameKey("nested/project"), "master"); Set res = new SubmoduleSectionParser(cfg, THIS_SERVER, targetBranch).parseAllSections(); Set expected = - Sets.newHashSet( - new SubmoduleSubscription(targetBranch, new Branch.NameKey(p1, "master"), "a")); + Sets.newHashSet(new SubmoduleSubscription(targetBranch, Branch.nameKey(p1, "master"), "a")); assertThat(res).containsExactlyElementsIn(expected); } diff --git a/plugins/delete-project b/plugins/delete-project index 4401de0976..f6dfbc5371 160000 --- a/plugins/delete-project +++ b/plugins/delete-project @@ -1 +1 @@ -Subproject commit 4401de09767d6e8655d29377f95145840a73feaf +Subproject commit f6dfbc5371e7be3dcfe5b9b2834c10bf0d92a811 diff --git a/plugins/hooks b/plugins/hooks index 976a6d10ee..034b9a4d48 160000 --- a/plugins/hooks +++ b/plugins/hooks @@ -1 +1 @@ -Subproject commit 976a6d10eec7b971254217df0399407f8543b37f +Subproject commit 034b9a4d48b739eb4c5ffb66be7cb808579a7a48 diff --git a/plugins/replication b/plugins/replication index 6a4105d7f3..fdf8449342 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 6a4105d7f3dc09fe2eb7cb15901178eab7723a44 +Subproject commit fdf84493424a5df5f1906beaaa7da714f848ddae diff --git a/plugins/reviewnotes b/plugins/reviewnotes index 3dec016f91..826c76a2bd 160000 --- a/plugins/reviewnotes +++ b/plugins/reviewnotes @@ -1 +1 @@ -Subproject commit 3dec016f9186131b2359d689a3e4a2c14717710e +Subproject commit 826c76a2bd25e445c526a6008b5525624b060b20 diff --git a/plugins/webhooks b/plugins/webhooks index 93bcec540d..62008312ac 160000 --- a/plugins/webhooks +++ b/plugins/webhooks @@ -1 +1 @@ -Subproject commit 93bcec540df35f0277240bc63bf5cc5f306e4ddd +Subproject commit 62008312ac68eaf109bad1200371eb505ee5c511 diff --git a/proto/entities.proto b/proto/entities.proto index be0aca713c..0855265607 100644 --- a/proto/entities.proto +++ b/proto/entities.proto @@ -147,8 +147,8 @@ message Project_NameKey { // Serialized form of com.google.gerrit.reviewdb.client.Branch.NameKey. // Next ID: 3 message Branch_NameKey { - optional Project_NameKey project_name = 1; - optional string branch_name = 2; + optional Project_NameKey project = 1; + optional string branch = 2; } // Serialized form of com.google.gerrit.reviewdb.client.RevId.