opendev/gerrit
Code Issues Proposed changes

PushOneCommit: Remove Result#getCommitId method

Browse Source 
RevCommit is a subclass of ObjectId, so we can always use getCommit
instead.

Change-Id: Ifbef23c01bc27881d874c6e09853ffc66bf9ac7a
This commit is contained in:
Dave Borowitz
2016-02-16 12:25:01 -05:00
parent bf55fa403a
commit 2dbe66442a
15 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PushOneCommit.java
View File

@@ -37,7 +37,6 @@ import com.google.inject.assistedinject.AssistedInject;
import org.eclipse.jgit.api.TagCommand;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.PushResult;
@@ -254,10 +253,6 @@ public class PushOneCommit {
return changeId;
}
public ObjectId getCommitId() {
return commit;
}
public RevCommit getCommit() {
return commit;
}

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java
View File

@@ -634,7 +634,7 @@ public class RevisionIT extends AbstractDaemonTest {
Locale.US);
String date = df.format(rev.commit.author.date);
assertThat(res).isEqualTo(
String.format(PATCH, r.getCommitId().name(), date, r.getChangeId()));
String.format(PATCH, r.getCommit().name(), date, r.getChangeId()));
}
@Test

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
View File

@@ -190,7 +190,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest {
r.assertOkStatus();
git().push()
.setRefSpecs(new RefSpec(r.getCommitId().name() + ":refs/heads/master"))
.setRefSpecs(new RefSpec(r.getCommit().name() + ":refs/heads/master"))
.call();
assertCommit(project, "refs/heads/master");
assertThat(getSubmitter(r.getPatchSetId())).isNull();

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
View File

@@ -138,7 +138,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
public void submitToEmptyRepo() throws Exception {
PushOneCommit.Result change = createChange();
submit(change.getChangeId());
assertThat(getRemoteHead().getId()).isEqualTo(change.getCommitId());
assertThat(getRemoteHead().getId()).isEqualTo(change.getCommit());
}
@Test

8
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmitByMerge.java
View File

@@ -52,7 +52,7 @@ public abstract class AbstractSubmitByMerge extends AbstractSubmit {
RevCommit head = getRemoteHead();
assertThat(head.getParentCount()).isEqualTo(2);
assertThat(head.getParent(0)).isEqualTo(oldHead);
assertThat(head.getParent(1)).isEqualTo(change2.getCommitId());
assertThat(head.getParent(1)).isEqualTo(change2.getCommit());
}
@Test
@@ -66,14 +66,14 @@ public abstract class AbstractSubmitByMerge extends AbstractSubmit {
submit(change2.getChangeId());
RevCommit oldHead = getRemoteHead();
testRepo.reset(change.getCommitId());
testRepo.reset(change.getCommit());
PushOneCommit.Result change3 =
createChange("Change 3", "a.txt", "bbb\nccc\n");
submit(change3.getChangeId());
RevCommit head = getRemoteHead();
assertThat(head.getParentCount()).isEqualTo(2);
assertThat(head.getParent(0)).isEqualTo(oldHead);
assertThat(head.getParent(1)).isEqualTo(change3.getCommitId());
assertThat(head.getParent(1)).isEqualTo(change3.getCommit());
}
@Test
@@ -104,7 +104,7 @@ public abstract class AbstractSubmitByMerge extends AbstractSubmit {
PushOneCommit.Result change2 = createChange();
approve(change1.getChangeId());
submit(change2.getChangeId());
assertThat(getRemoteHead().getId()).isEqualTo(change2.getCommitId());
assertThat(getRemoteHead().getId()).isEqualTo(change2.getCommit());
}
@Test

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ListChangesOptionsIT.java
View File

@@ -95,6 +95,6 @@ public class ListChangesOptionsIT extends AbstractDaemonTest {
}
private String commitId(int i) {
return results.get(i).getCommitId().name();
return results.get(i).getCommit().name();
}
}

6
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java
View File

@@ -89,7 +89,7 @@ public class SubmitByCherryPickIT extends AbstractSubmit {
submit(change2.getChangeId());
RevCommit oldHead = getRemoteHead();
testRepo.reset(change.getCommitId());
testRepo.reset(change.getCommit());
PushOneCommit.Result change3 =
createChange("Change 3", "a.txt", "bbb\nccc\n");
submit(change3.getChangeId());
@@ -121,7 +121,7 @@ public class SubmitByCherryPickIT extends AbstractSubmit {
"upload the rebased commit for review.");
assertThat(getRemoteHead()).isEqualTo(oldHead);
assertCurrentRevision(change2.getChangeId(), 1, change2.getCommitId());
assertCurrentRevision(change2.getChangeId(), 1, change2.getCommit());
assertNoSubmitter(change2.getChangeId(), 1);
}
@@ -166,7 +166,7 @@ public class SubmitByCherryPickIT extends AbstractSubmit {
"upload the rebased commit for review.");
assertThat(getRemoteHead()).isEqualTo(oldHead);
assertCurrentRevision(change3.getChangeId(), 1, change3.getCommitId());
assertCurrentRevision(change3.getChangeId(), 1, change3.getCommit());
assertNoSubmitter(change3.getChangeId(), 1);
}

6
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java
View File

@@ -49,7 +49,7 @@ public class SubmitByFastForwardIT extends AbstractSubmit {
PushOneCommit.Result change = createChange();
submit(change.getChangeId());
RevCommit head = getRemoteHead();
assertThat(head.getId()).isEqualTo(change.getCommitId());
assertThat(head.getId()).isEqualTo(change.getCommit());
assertThat(head.getParent(0)).isEqualTo(oldHead);
assertSubmitter(change.getChangeId(), 1);
}
@@ -65,8 +65,8 @@ public class SubmitByFastForwardIT extends AbstractSubmit {
submit(id2);
RevCommit head = getRemoteHead();
assertThat(head.getId()).isEqualTo(change2.getCommitId());
assertThat(head.getParent(0).getId()).isEqualTo(change.getCommitId());
assertThat(head.getId()).isEqualTo(change2.getCommit());
assertThat(head.getParent(0).getId()).isEqualTo(change.getCommit());
assertSubmitter(change.getChangeId(), 1);
assertSubmitter(change2.getChangeId(), 1);
assertPersonEquals(admin.getIdent(), head.getAuthorIdent());

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeAlwaysIT.java
View File

@@ -39,7 +39,7 @@ public class SubmitByMergeAlwaysIT extends AbstractSubmitByMerge {
RevCommit head = getRemoteHead();
assertThat(head.getParentCount()).isEqualTo(2);
assertThat(head.getParent(0)).isEqualTo(oldHead);
assertThat(head.getParent(1)).isEqualTo(change.getCommitId());
assertThat(head.getParent(1)).isEqualTo(change.getCommit());
assertSubmitter(change.getChangeId(), 1);
assertPersonEquals(admin.getIdent(), head.getAuthorIdent());
assertPersonEquals(serverIdent.get(), head.getCommitterIdent());

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
View File

@@ -26,7 +26,7 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge {
PushOneCommit.Result change = createChange();
submit(change.getChangeId());
RevCommit head = getRemoteHead();
assertThat(head.getId()).isEqualTo(change.getCommitId());
assertThat(head.getId()).isEqualTo(change.getCommit());
assertThat(head.getParent(0)).isEqualTo(oldHead);
assertSubmitter(change.getChangeId(), 1);
assertPersonEquals(admin.getIdent(), head.getAuthorIdent());

6
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByRebaseIfNecessaryIT.java
View File

@@ -49,7 +49,7 @@ public class SubmitByRebaseIfNecessaryIT extends AbstractSubmit {
PushOneCommit.Result change = createChange();
submit(change.getChangeId());
RevCommit head = getRemoteHead();
assertThat(head.getId()).isEqualTo(change.getCommitId());
assertThat(head.getId()).isEqualTo(change.getCommit());
assertThat(head.getParent(0)).isEqualTo(oldHead);
assertApproved(change.getChangeId());
assertCurrentRevision(change.getChangeId(), 1, head);
@@ -130,7 +130,7 @@ public class SubmitByRebaseIfNecessaryIT extends AbstractSubmit {
submit(change2.getChangeId());
RevCommit oldHead = getRemoteHead();
testRepo.reset(change.getCommitId());
testRepo.reset(change.getCommit());
PushOneCommit.Result change3 =
createChange("Change 3", "a.txt", "bbb\nccc\n");
submit(change3.getChangeId());
@@ -158,7 +158,7 @@ public class SubmitByRebaseIfNecessaryIT extends AbstractSubmit {
submitWithConflict(change2.getChangeId(), "Merge Conflict");
RevCommit head = getRemoteHead();
assertThat(head).isEqualTo(oldHead);
assertCurrentRevision(change2.getChangeId(), 1, change2.getCommitId());
assertCurrentRevision(change2.getChangeId(), 1, change2.getCommit());
assertNoSubmitter(change2.getChangeId(), 1);
}

6
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GetCommitIT.java
View File

@@ -96,8 +96,8 @@ public class GetCommitIT extends AbstractDaemonTest {
.to("refs/for/master");
r.assertOkStatus();
CommitInfo info = getCommit(r.getCommitId());
assertThat(info.commit).isEqualTo(r.getCommitId().name());
CommitInfo info = getCommit(r.getCommit());
assertThat(info.commit).isEqualTo(r.getCommit().name());
assertThat(info.subject).isEqualTo("test commit");
assertThat(info.message).isEqualTo(
"test commit\n\nChange-Id: " + r.getChangeId() + "\n");
@@ -119,7 +119,7 @@ public class GetCommitIT extends AbstractDaemonTest {
PushOneCommit.Result r = pushFactory.create(db, admin.getIdent(), testRepo)
.to("refs/for/master");
r.assertOkStatus();
assertNotFound(r.getCommitId());
assertNotFound(r.getCommit());
}
private void unblockRead() throws Exception {

14
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/TagsIT.java
View File

@@ -112,18 +112,18 @@ public class TagsIT extends AbstractDaemonTest {
TagInfo t = result.get(0);
assertThat(t.ref).isEqualTo(Constants.R_TAGS + tag1.name);
assertThat(t.revision).isEqualTo(r1.getCommitId().getName());
assertThat(t.revision).isEqualTo(r1.getCommit().getName());
t = result.get(1);
assertThat(t.ref).isEqualTo(Constants.R_TAGS + tag2.name);
assertThat(t.object).isEqualTo(r2.getCommitId().getName());
assertThat(t.object).isEqualTo(r2.getCommit().getName());
assertThat(t.message).isEqualTo(tag2.message);
assertThat(t.tagger.name).isEqualTo(tag2.tagger.getName());
assertThat(t.tagger.email).isEqualTo(tag2.tagger.getEmailAddress());
t = result.get(2);
assertThat(t.ref).isEqualTo(tag3Ref);
assertThat(t.object).isEqualTo(r2.getCommitId().getName());
assertThat(t.object).isEqualTo(r2.getCommit().getName());
assertThat(t.message).isEqualTo(tag2.message);
assertThat(t.tagger.name).isEqualTo(tag2.tagger.getName());
assertThat(t.tagger.email).isEqualTo(tag2.tagger.getEmailAddress());
@@ -207,15 +207,15 @@ public class TagsIT extends AbstractDaemonTest {
List<TagInfo> result = getTags().get();
assertThat(result).hasSize(2);
assertThat(result.get(0).ref).isEqualTo("refs/tags/" + tag1.name);
assertThat(result.get(0).revision).isEqualTo(r1.getCommitId().getName());
assertThat(result.get(0).revision).isEqualTo(r1.getCommit().getName());
assertThat(result.get(1).ref).isEqualTo("refs/tags/" + tag2.name);
assertThat(result.get(1).revision).isEqualTo(r2.getCommitId().getName());
assertThat(result.get(1).revision).isEqualTo(r2.getCommit().getName());
blockRead("refs/heads/hidden");
result = getTags().get();
assertThat(result).hasSize(1);
assertThat(result.get(0).ref).isEqualTo("refs/tags/" + tag1.name);
assertThat(result.get(0).revision).isEqualTo(r1.getCommitId().getName());
assertThat(result.get(0).revision).isEqualTo(r1.getCommit().getName());
}
@Test
@@ -232,7 +232,7 @@ public class TagsIT extends AbstractDaemonTest {
TagInfo tagInfo = getTag(tag1.name);
assertThat(tagInfo.ref).isEqualTo("refs/tags/" + tag1.name);
assertThat(tagInfo.revision).isEqualTo(r1.getCommitId().getName());
assertThat(tagInfo.revision).isEqualTo(r1.getCommit().getName());
}
private void createTags() throws Exception {

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java
View File

@@ -365,7 +365,7 @@ public class LabelTypeIT extends AbstractDaemonTest {
revision(r).submit();
try (Repository repo = repoManager.openRepository(project)) {
assertThat(repo.exactRef("refs/heads/master").getObjectId()).isEqualTo(
r.getCommitId());
r.getCommit());
}
}

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/UploadArchiveIT.java
View File

@@ -55,7 +55,7 @@ public class UploadArchiveIT extends AbstractDaemonTest {
@Test
public void zipFormat() throws Exception {
PushOneCommit.Result r = createChange();
String abbreviated = r.getCommitId().abbreviate(8).name();
String abbreviated = r.getCommit().abbreviate(8).name();
String c = command(r, abbreviated);
InputStream out =
@@ -98,7 +98,7 @@ public class UploadArchiveIT extends AbstractDaemonTest {
private void archiveNotPermitted() throws Exception {
PushOneCommit.Result r = createChange();
String abbreviated = r.getCommitId().abbreviate(8).name();
String abbreviated = r.getCommit().abbreviate(8).name();
String c = command(r, abbreviated);
InputStream out =