diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java index 0908d9474a..631b4802d5 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -20,6 +20,7 @@ import static com.google.gerrit.acceptance.PushOneCommit.FILE_NAME; import static com.google.gerrit.acceptance.PushOneCommit.SUBJECT; import static com.google.gerrit.extensions.client.ReviewerState.CC; import static com.google.gerrit.extensions.client.ReviewerState.REVIEWER; +import static com.google.gerrit.reviewdb.client.RefNames.changeMetaRef; import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS; import static com.google.gerrit.server.group.SystemGroupBackend.CHANGE_OWNER; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; @@ -65,7 +66,6 @@ import com.google.gerrit.server.change.ChangeResource; import com.google.gerrit.server.config.AnonymousCowardNameProvider; import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.group.SystemGroupBackend; -import com.google.gerrit.server.notedb.ChangeNoteUtil; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.Util; import com.google.gerrit.testutil.FakeEmailSender.Message; @@ -1099,8 +1099,7 @@ public class ChangeIT extends AbstractDaemonTest { try (Repository repo = repoManager.openRepository(project); RevWalk rw = new RevWalk(repo)) { RevCommit commitPatchSetCreation = rw.parseCommit( - repo.exactRef(ChangeNoteUtil.changeRefName(new Change.Id(c._number))) - .getObjectId()); + repo.exactRef(changeMetaRef(new Change.Id(c._number))).getObjectId()); assertThat(commitPatchSetCreation.getShortMessage()) .isEqualTo("Create patch set 2"); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java index 00d9beda8c..924eb4da25 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java @@ -16,6 +16,7 @@ package com.google.gerrit.acceptance.rest.change; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.TruthJUnit.assume; +import static com.google.gerrit.reviewdb.client.RefNames.changeMetaRef; import static java.util.concurrent.TimeUnit.SECONDS; import static org.eclipse.jgit.lib.Constants.SIGNED_OFF_BY_TAG; @@ -31,7 +32,6 @@ import com.google.gerrit.extensions.restapi.MethodNotAllowedException; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.config.AnonymousCowardNameProvider; -import com.google.gerrit.server.notedb.ChangeNoteUtil; import com.google.gerrit.testutil.ConfigSuite; import com.google.gerrit.testutil.TestTimeUtil; @@ -122,8 +122,7 @@ public class CreateChangeIT extends AbstractDaemonTest { try (Repository repo = repoManager.openRepository(project); RevWalk rw = new RevWalk(repo)) { RevCommit commit = rw.parseCommit( - repo.exactRef(ChangeNoteUtil.changeRefName(new Change.Id(c._number))) - .getObjectId()); + repo.exactRef(changeMetaRef(new Change.Id(c._number))).getObjectId()); assertThat(commit.getShortMessage()).isEqualTo("Create change"); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java index 1deabe7d75..b864bf0524 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java @@ -16,6 +16,7 @@ package com.google.gerrit.acceptance.server.notedb; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.TruthJUnit.assume; +import static com.google.gerrit.reviewdb.client.RefNames.changeMetaRef; import com.google.common.collect.ImmutableList; import com.google.gerrit.acceptance.AbstractDaemonTest; @@ -41,7 +42,6 @@ import com.google.gerrit.server.change.Rebuild; import com.google.gerrit.server.change.RevisionResource; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.notedb.ChangeBundle; -import com.google.gerrit.server.notedb.ChangeNoteUtil; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.notedb.NoteDbChangeState; import com.google.gerrit.server.schema.DisabledChangesReviewDbWrapper; @@ -283,8 +283,7 @@ public class ChangeRebuilderIT extends AbstractDaemonTest { PushOneCommit.Result r = createChange(); Change.Id id = r.getPatchSetId().getParentKey(); - ObjectId changeMetaId = getMetaRef( - project, ChangeNoteUtil.changeRefName(id)); + ObjectId changeMetaId = getMetaRef(project, changeMetaRef(id)); assertThat(unwrapDb().changes().get(id).getNoteDbState()).isEqualTo( changeMetaId.name()); diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RefNames.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RefNames.java index 85ebdb137c..1486c93f6d 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RefNames.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RefNames.java @@ -14,7 +14,6 @@ package com.google.gerrit.reviewdb.client; - /** Constants and utilities for Gerrit-specific ref names. */ public class RefNames { public static final String REFS = "refs/"; @@ -79,6 +78,21 @@ public class RefNames { return ref; } + public static String changeMetaRef(Change.Id id) { + StringBuilder r = new StringBuilder(); + r.append(REFS_CHANGES); + int n = id.get(); + int m = n % 100; + if (m < 10) { + r.append('0'); + } + r.append(m); + r.append('/'); + r.append(n); + r.append(META_SUFFIX); + return r.toString(); + } + public static String refsUsers(Account.Id accountId) { StringBuilder r = new StringBuilder(); r.append(REFS_USERS); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNoteUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNoteUtil.java index 8b112a326a..e1f21409a4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNoteUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNoteUtil.java @@ -31,7 +31,6 @@ import com.google.gerrit.reviewdb.client.Patch; import com.google.gerrit.reviewdb.client.PatchLineComment; import com.google.gerrit.reviewdb.client.PatchLineComment.Status; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.client.RevId; import com.google.gerrit.reviewdb.server.ReviewDbUtil; import com.google.gerrit.server.GerritPersonIdent; @@ -88,21 +87,6 @@ public class ChangeNoteUtil { private static final String UUID = "UUID"; private static final String TAG = FOOTER_TAG.getName(); - public static String changeRefName(Change.Id id) { - StringBuilder r = new StringBuilder(); - r.append(RefNames.REFS_CHANGES); - int n = id.get(); - int m = n % 100; - if (m < 10) { - r.append('0'); - } - r.append(m); - r.append('/'); - r.append(n); - r.append(RefNames.META_SUFFIX); - return r.toString(); - } - public static String formatTime(PersonIdent ident, Timestamp t) { GitDateFormatter dateFormatter = new GitDateFormatter(Format.DEFAULT); // TODO(dborowitz): Use a ThreadLocal or use Joda. diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java index b68548535b..2efe8c919e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java @@ -17,6 +17,7 @@ package com.google.gerrit.server.notedb; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; +import static com.google.gerrit.reviewdb.client.RefNames.changeMetaRef; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -530,7 +531,7 @@ public class ChangeNotes extends AbstractChangeNotes { @Override protected String getRefName() { - return ChangeNoteUtil.changeRefName(getChangeId()); + return changeMetaRef(getChangeId()); } public PatchSet getCurrentPatchSet() { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilderImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilderImpl.java index 22c5fde7a2..aba0b439b9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilderImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilderImpl.java @@ -18,6 +18,7 @@ import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; +import static com.google.gerrit.reviewdb.client.RefNames.changeMetaRef; import static com.google.gerrit.server.PatchLineCommentsUtil.setCommentRevId; import static com.google.gerrit.server.notedb.ChangeNoteUtil.FOOTER_HASHTAGS; import static com.google.gerrit.server.notedb.ChangeNoteUtil.FOOTER_PATCH_SET; @@ -401,7 +402,7 @@ public class ChangeRebuilderImpl extends ChangeRebuilder { private List getHashtagsEvents(Change change, NoteDbUpdateManager manager) throws IOException { - String refName = ChangeNoteUtil.changeRefName(change.getId()); + String refName = changeMetaRef(change.getId()); ObjectId old = manager.getChangeRepo().getObjectId(refName); if (old == null) { return Collections.emptyList(); @@ -460,7 +461,7 @@ public class ChangeRebuilderImpl extends ChangeRebuilder { private void deleteRef(Change change, Repository repo, ChainedReceiveCommands cmds) throws IOException { - String refName = ChangeNoteUtil.changeRefName(change.getId()); + String refName = changeMetaRef(change.getId()); ObjectId old = cmds.getObjectId(repo, refName); if (old != null) { cmds.add(new ReceiveCommand(old, ObjectId.zeroId(), refName)); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java index a947cb498b..3c7f90914b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java @@ -18,6 +18,7 @@ import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; +import static com.google.gerrit.reviewdb.client.RefNames.changeMetaRef; import static com.google.gerrit.server.notedb.ChangeNoteUtil.FOOTER_BRANCH; import static com.google.gerrit.server.notedb.ChangeNoteUtil.FOOTER_CHANGE_ID; import static com.google.gerrit.server.notedb.ChangeNoteUtil.FOOTER_COMMIT; @@ -480,7 +481,7 @@ public class ChangeUpdate extends AbstractChangeUpdate { @Override protected String getRefName() { - return ChangeNoteUtil.changeRefName(getId()); + return changeMetaRef(getId()); } @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbChangeState.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbChangeState.java index 6b6265640a..18844f0ffe 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbChangeState.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbChangeState.java @@ -16,6 +16,7 @@ package com.google.gerrit.server.notedb; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.gerrit.reviewdb.client.RefNames.changeMetaRef; import com.google.auto.value.AutoValue; import com.google.common.annotations.VisibleForTesting; @@ -166,7 +167,7 @@ public class NoteDbChangeState { } public boolean isChangeUpToDate(Repository changeRepo) throws IOException { - Ref ref = changeRepo.exactRef(ChangeNoteUtil.changeRefName(changeId)); + Ref ref = changeRepo.exactRef(changeMetaRef(changeId)); if (ref == null) { return changeMetaId.equals(ObjectId.zeroId()); } diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java index c73d972eab..1102a0a9d7 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.notedb; import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.reviewdb.client.RefNames.changeMetaRef; import static com.google.gerrit.reviewdb.client.RefNames.refsDraftComments; -import static com.google.gerrit.server.notedb.ChangeNoteUtil.changeRefName; import static com.google.gerrit.server.notedb.ReviewerStateInternal.CC; import static com.google.gerrit.server.notedb.ReviewerStateInternal.REVIEWER; import static com.google.gerrit.testutil.TestChanges.incrementPatchSet; @@ -525,7 +525,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { @Test public void emptyChangeUpdate() throws Exception { Change c = newChange(); - Ref initial = repo.exactRef(changeRefName(c.getId())); + Ref initial = repo.exactRef(changeMetaRef(c.getId())); assertThat(initial).isNotNull(); // Empty update doesn't create a new commit. @@ -533,7 +533,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { update.commit(); assertThat(update.getResult()).isNull(); - Ref updated = repo.exactRef(changeRefName(c.getId())); + Ref updated = repo.exactRef(changeMetaRef(c.getId())); assertThat(updated.getObjectId()).isEqualTo(initial.getObjectId()); } @@ -1877,7 +1877,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { update.putComment(comment); update.commit(); - assertThat(repo.exactRef(changeRefName(c.getId()))).isNotNull(); + assertThat(repo.exactRef(changeMetaRef(c.getId()))).isNotNull(); String draftRef = refsDraftComments(otherUser.getAccountId(), c.getId()); assertThat(exactRefAllUsers(draftRef)).isNull(); } diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/NoteDbChecker.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/NoteDbChecker.java index 6fc5ef9b8e..66eed8b435 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/testutil/NoteDbChecker.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/NoteDbChecker.java @@ -20,12 +20,12 @@ import com.google.common.base.Joiner; import com.google.common.collect.Iterables; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; +import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDbUtil; import com.google.gerrit.server.PatchLineCommentsUtil; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.notedb.ChangeBundle; -import com.google.gerrit.server.notedb.ChangeNoteUtil; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.notedb.ChangeRebuilder; import com.google.gerrit.server.schema.DisabledChangesReviewDbWrapper; @@ -118,8 +118,7 @@ public class NoteDbChecker { public void assertNoChangeRef(Project.NameKey project, Change.Id changeId) throws Exception { try (Repository repo = repoManager.openRepository(project)) { - assertThat(repo.exactRef(ChangeNoteUtil.changeRefName(changeId))) - .isNull(); + assertThat(repo.exactRef(RefNames.changeMetaRef(changeId))).isNull(); } }