opendev/gerrit
Code Issues Proposed changes

Merge "Make refs/draft-comments/ consistent with refs/starred-changes/"

Browse Source
This commit is contained in:
Edwin Kempin
2015-12-03 12:02:22 +00:00
committed by Gerrit Code Review
parent 6aeb1c1384 f67da65ef6
commit 76d65ee8eb
3 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RefNames.java
View File

@@ -92,28 +92,13 @@ public class RefNames {
public static String refsDraftComments(Account.Id accountId, public static String refsDraftComments(Account.Id accountId,
Change.Id changeId) { Change.Id changeId) {
StringBuilder r = buildRefsDraftCommentsPrefix(accountId); StringBuilder r = buildRefsPrefix(REFS_DRAFT_COMMENTS, accountId);
r.append(changeId.get()); r.append(changeId.get());
return r.toString(); return r.toString();
} }
public static String refsDraftCommentsPrefix(Account.Id accountId) { public static String refsDraftCommentsPrefix(Account.Id accountId) {
return buildRefsDraftCommentsPrefix(accountId).toString(); return buildRefsPrefix(REFS_DRAFT_COMMENTS, accountId).toString();
}
public static StringBuilder buildRefsDraftCommentsPrefix(
Account.Id accountId) {
StringBuilder r = new StringBuilder();
r.append(REFS_DRAFT_COMMENTS);
int n = accountId.get() % 100;
if (n < 10) {
r.append('0');
}
r.append(n);
r.append('/');
r.append(accountId.get());
r.append('-');
return r;
} }
public static String refsStarredChanges(Account.Id accountId, public static String refsStarredChanges(Account.Id accountId,

4
gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/RefNamesTest.java
View File

@@ -39,13 +39,13 @@ public class RefNamesTest {
@Test @Test
public void refsDraftComments() throws Exception { public void refsDraftComments() throws Exception {
assertThat(RefNames.refsDraftComments(accountId, changeId)) assertThat(RefNames.refsDraftComments(accountId, changeId))
.isEqualTo("refs/draft-comments/23/1011123-67473"); .isEqualTo("refs/draft-comments/23/1011123/67473");
} }
@Test @Test
public void refsDraftCommentsPrefix() throws Exception { public void refsDraftCommentsPrefix() throws Exception {
assertThat(RefNames.refsDraftCommentsPrefix(accountId)) assertThat(RefNames.refsDraftCommentsPrefix(accountId))
.isEqualTo("refs/draft-comments/23/1011123-"); .isEqualTo("refs/draft-comments/23/1011123/");
} }
@Test @Test

2
gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java
View File

@@ -371,7 +371,7 @@ public class PatchLineCommentsUtil {
private Iterable<String> getDraftRefs(final Change.Id changeId) private Iterable<String> getDraftRefs(final Change.Id changeId)
throws OrmException { throws OrmException {
Set<String> refNames = getRefNamesAllUsers(RefNames.REFS_DRAFT_COMMENTS); Set<String> refNames = getRefNamesAllUsers(RefNames.REFS_DRAFT_COMMENTS);
final String suffix = "-" + changeId.get(); final String suffix = "/" + changeId.get();
return Iterables.filter(refNames, new Predicate<String>() { return Iterables.filter(refNames, new Predicate<String>() {
@Override @Override
public boolean apply(String input) { public boolean apply(String input) {