opendev/gerrit
Code Issues Proposed changes

Fix deprecation warnings from latest JGit update

Browse Source 
- FS is no longer required for LockFile constructor.
 - TestRepository#getClock was renamed getDate.
 - Replace usages of RefDatabase#getRef with either exactRef, when we
   know we can bypass the full lookup path, or findRef, where the
   input is user-provided and we might need to add an implicit prefix.

Change-Id: I6309b91ccf99ffaa724be273ddae0d9857b825f9
This commit is contained in:
Dave Borowitz
2016-01-06 10:34:50 -05:00
parent bb5c68c4b9
commit f83c424b4b
25 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -397,7 +397,7 @@ public abstract class AbstractDaemonTest {
}
protected TestRepository<?>.CommitBuilder amendBuilder() throws Exception {
ObjectId head = repo().getRef("HEAD").getObjectId();
ObjectId head = repo().exactRef("HEAD").getObjectId();
TestRepository<?>.CommitBuilder b = testRepo.amendRef("HEAD");
Optional<String> id = GitUtil.getChangeId(testRepo, head);
// TestRepository behaves like "git commit --amend -m foo", which does not

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

@@ -176,7 +176,7 @@ public class PushOneCommit {
}
commitBuilder.message(subject)
.author(i)
.committer(new PersonIdent(i, testRepo.getClock()));
.committer(new PersonIdent(i, testRepo.getDate()));
}
public Result to(String ref) throws Exception {

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java
View File

@@ -102,7 +102,7 @@ public class AccountIT extends AbstractDaemonTest {
@After
public void clearPublicKeyStore() throws Exception {
try (Repository repo = repoManager.openRepository(allUsers)) {
Ref ref = repo.getRef(REFS_GPG_KEYS);
Ref ref = repo.exactRef(REFS_GPG_KEYS);
if (ref != null) {
RefUpdate ru = repo.updateRef(REFS_GPG_KEYS);
ru.setForceUpdate(true);

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
View File

@@ -106,7 +106,7 @@ public class ChangeIT extends AbstractDaemonTest {
gApi.changes().id(changeId).get();
BranchInput b = new BranchInput();
b.revision = repo().getRef("HEAD").getObjectId().name();
b.revision = repo().exactRef("HEAD").getObjectId().name();
gApi.projects()
.name(project.get())
.branch("other")

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

@@ -377,7 +377,7 @@ public class RevisionIT extends AbstractDaemonTest {
@Test
public void mergeable() throws Exception {
ObjectId initial = repo().getRef(HEAD).getLeaf().getObjectId();
ObjectId initial = repo().exactRef(HEAD).getLeaf().getObjectId();
PushOneCommit push1 =
pushFactory.create(db, admin.getIdent(), testRepo, PushOneCommit.SUBJECT,

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/ForcePushIT.java
View File

@@ -29,7 +29,7 @@ public class ForcePushIT extends AbstractDaemonTest {
@Test
public void forcePushNotAllowed() throws Exception {
ObjectId initial = repo().getRef(HEAD).getLeaf().getObjectId();
ObjectId initial = repo().exactRef(HEAD).getLeaf().getObjectId();
PushOneCommit push1 =
pushFactory.create(db, admin.getIdent(), testRepo, "change1", "a.txt", "content");
PushOneCommit.Result r1 = push1.to("refs/heads/master");
@@ -49,7 +49,7 @@ public class ForcePushIT extends AbstractDaemonTest {
@Test
public void forcePushAllowed() throws Exception {
ObjectId initial = repo().getRef(HEAD).getLeaf().getObjectId();
ObjectId initial = repo().exactRef(HEAD).getLeaf().getObjectId();
grant(Permission.PUSH, project, "refs/*", true);
PushOneCommit push1 =
pushFactory.create(db, admin.getIdent(), testRepo, "change1", "a.txt", "content");

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

@@ -107,7 +107,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest {
@Test
public void submitOnPushMergeConflict() throws Exception {
ObjectId objectId = repo().getRef("HEAD").getObjectId();
ObjectId objectId = repo().exactRef("HEAD").getObjectId();
push("refs/heads/master", "one change", "a.txt", "some content");
testRepo.reset(objectId);
@@ -123,7 +123,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest {
@Test
public void submitOnPushSuccessfulMerge() throws Exception {
String master = "refs/heads/master";
ObjectId objectId = repo().getRef("HEAD").getObjectId();
ObjectId objectId = repo().exactRef("HEAD").getObjectId();
push(master, "one change", "a.txt", "some content");
testRepo.reset(objectId);
@@ -233,7 +233,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest {
private void assertCommit(Project.NameKey project, String branch) throws IOException {
try (Repository r = repoManager.openRepository(project);
RevWalk rw = new RevWalk(r)) {
RevCommit c = rw.parseCommit(r.getRef(branch).getObjectId());
RevCommit c = rw.parseCommit(r.exactRef(branch).getObjectId());
assertThat(c.getShortMessage()).isEqualTo(PushOneCommit.SUBJECT);
assertThat(c.getAuthorIdent().getEmailAddress()).isEqualTo(admin.email);
assertThat(c.getCommitterIdent().getEmailAddress()).isEqualTo(
@@ -244,7 +244,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest {
private void assertMergeCommit(String branch, String subject) throws IOException {
try (Repository r = repoManager.openRepository(project);
RevWalk rw = new RevWalk(r)) {
RevCommit c = rw.parseCommit(r.getRef(branch).getObjectId());
RevCommit c = rw.parseCommit(r.exactRef(branch).getObjectId());
assertThat(c.getParentCount()).isEqualTo(2);
assertThat(c.getShortMessage()).isEqualTo("Merge \"" + subject + "\"");
assertThat(c.getAuthorIdent().getEmailAddress()).isEqualTo(admin.email);
@@ -256,7 +256,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest {
private void assertTag(Project.NameKey project, String branch,
PushOneCommit.Tag tag) throws IOException {
try (Repository repo = repoManager.openRepository(project)) {
Ref tagRef = repo.getRef(tag.name);
Ref tagRef = repo.findRef(tag.name);
assertThat(tagRef).isNotNull();
ObjectId taggedCommit = null;
if (tag instanceof PushOneCommit.AnnotatedTag) {
@@ -273,7 +273,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest {
} else {
taggedCommit = tagRef.getObjectId();
}
ObjectId headCommit = repo.getRef(branch).getObjectId();
ObjectId headCommit = repo.exactRef(branch).getObjectId();
assertThat(taggedCommit).isNotNull();
assertThat(taggedCommit).isEqualTo(headCommit);
}

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java
View File

@@ -104,13 +104,13 @@ public class VisibleRefFilterIT extends AbstractDaemonTest {
// master-tag -> master
RefUpdate mtu = repo.updateRef("refs/tags/master-tag");
mtu.setExpectedOldObjectId(ObjectId.zeroId());
mtu.setNewObjectId(repo.getRef("refs/heads/master").getObjectId());
mtu.setNewObjectId(repo.exactRef("refs/heads/master").getObjectId());
assertThat(mtu.update()).isEqualTo(RefUpdate.Result.NEW);
// branch-tag -> branch
RefUpdate btu = repo.updateRef("refs/tags/branch-tag");
btu.setExpectedOldObjectId(ObjectId.zeroId());
btu.setNewObjectId(repo.getRef("refs/heads/branch").getObjectId());
btu.setNewObjectId(repo.exactRef("refs/heads/branch").getObjectId());
assertThat(btu.update()).isEqualTo(RefUpdate.Result.NEW);
}
}

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

@@ -255,7 +255,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
repoManager.openRepository(new Project.NameKey(c.project))) {
String refName = new PatchSet.Id(new Change.Id(c._number), expectedNum)
.toRefName();
Ref ref = repo.getRef(refName);
Ref ref = repo.exactRef(refName);
assertThat(ref).named(refName).isNotNull();
assertThat(ref.getObjectId()).isEqualTo(expectedId);
}
@@ -347,7 +347,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
try (Repository repo = repoManager.openRepository(project);
RevWalk rw = new RevWalk(repo)) {
rw.markStart(rw.parseCommit(
repo.getRef("refs/heads/" + branch).getObjectId()));
repo.exactRef("refs/heads/" + branch).getObjectId()));
return Lists.newArrayList(rw);
}
}
@@ -358,7 +358,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
private RevCommit getHead(Repository repo, String name) throws IOException {
try (RevWalk rw = new RevWalk(repo)) {
return rw.parseCommit(repo.getRef(name).getObjectId());
return rw.parseCommit(repo.exactRef(name).getObjectId());
}
}

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java
View File

@@ -269,7 +269,7 @@ public class CreateProjectIT extends AbstractDaemonTest {
throws RepositoryNotFoundException, IOException {
try (Repository repo =
repoManager.openRepository(new Project.NameKey(projectName))) {
assertThat(repo.getRef(Constants.HEAD).getTarget().getName())
assertThat(repo.exactRef(Constants.HEAD).getTarget().getName())
.isEqualTo(expectedRef);
}
}
@@ -281,7 +281,7 @@ public class CreateProjectIT extends AbstractDaemonTest {
RevWalk rw = new RevWalk(repo);
TreeWalk tw = new TreeWalk(rw.getObjectReader())) {
for (String ref : refs) {
RevCommit commit = rw.lookupCommit(repo.getRef(ref).getObjectId());
RevCommit commit = rw.lookupCommit(repo.exactRef(ref).getObjectId());
rw.parseBody(commit);
tw.addTree(commit.getTree());
assertThat(tw.next()).isFalse();

6
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java
View File

@@ -61,7 +61,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest {
testRepo = new TestRepository<>(
(InMemoryRepository) repoManager.openRepository(project));
tip = testRepo.getRevWalk().parseCommit(
testRepo.getRepository().getRef("HEAD").getObjectId());
testRepo.getRepository().exactRef("HEAD").getObjectId());
adminId = admin.getId();
checker = checkerProvider.get();
}
@@ -180,7 +180,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest {
assertThat(p.status).isEqualTo(ProblemInfo.Status.FIXED);
assertThat(p.outcome).isEqualTo("Repaired patch set ref");
assertThat(testRepo.getRepository().getRef(refName).getObjectId().name())
assertThat(testRepo.getRepository().exactRef(refName).getObjectId().name())
.isEqualTo(ps.getRevision().get());
}
@@ -310,7 +310,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest {
public void missingDestRef() throws Exception {
String ref = "refs/heads/master";
// Detach head so we're allowed to delete ref.
testRepo.reset(testRepo.getRepository().getRef(ref).getObjectId());
testRepo.reset(testRepo.getRepository().exactRef(ref).getObjectId());
RefUpdate ru = testRepo.getRepository().updateRef(ref);
ru.setForceUpdate(true);
assertThat(ru.delete()).isEqualTo(RefUpdate.Result.FORCED);

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
View File

@@ -163,7 +163,7 @@ public class GetRelatedIT extends AbstractDaemonTest {
// 2,2---1,2---3,1
// Create two commits and push.
ObjectId initial = repo().getRef("HEAD").getObjectId();
ObjectId initial = repo().exactRef("HEAD").getObjectId();
RevCommit c1_1 = commitBuilder()
.add("a.txt", "1")
.message("subject: 1")

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/SubmittedTogetherIT.java
View File

@@ -194,7 +194,7 @@ public class SubmittedTogetherIT extends AbstractDaemonTest {
private RevCommit getRemoteHead() throws IOException {
try (Repository repo = repoManager.openRepository(project);
RevWalk rw = new RevWalk(repo)) {
return rw.parseCommit(repo.getRef("refs/heads/master").getObjectId());
return rw.parseCommit(repo.exactRef("refs/heads/master").getObjectId());
}
}

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

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

2
gerrit-gpg/src/test/java/com/google/gerrit/gpg/PublicKeyStoreTest.java
View File

@@ -149,7 +149,7 @@ public class PublicKeyStoreTest {
RevWalk rw = new RevWalk(reader)) {
NoteMap notes = NoteMap.read(
reader, tr.getRevWalk().parseCommit(
tr.getRepository().getRef(REFS_GPG_KEYS).getObjectId()));
tr.getRepository().exactRef(REFS_GPG_KEYS).getObjectId()));
String contents = new String(
reader.open(notes.get(keyObjectId(key1.getKeyId()))).getBytes(),
UTF_8);

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProtoGen.java
View File

@@ -21,7 +21,6 @@ import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gwtorm.schema.java.JavaSchemaModel;
import org.eclipse.jgit.internal.storage.file.LockFile;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.IO;
import org.kohsuke.args4j.Option;
@@ -39,7 +38,7 @@ public class ProtoGen extends AbstractProgram {
@Override
public int run() throws Exception {
LockFile lock = new LockFile(file.getAbsoluteFile(), FS.DETECTED);
LockFile lock = new LockFile(file.getAbsoluteFile());
if (!lock.lock()) {
throw die("Cannot lock " + file);
}

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java
View File

@@ -27,7 +27,6 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.eclipse.jgit.internal.storage.file.LockFile;
import org.eclipse.jgit.util.FS;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -96,7 +95,7 @@ class InitContainer implements InitStep {
try (InputStream in = Files.newInputStream(myWar)) {
Files.createDirectories(siteWar.getParent());
LockFile lf = new LockFile(siteWar.toFile(), FS.DETECTED);
LockFile lf = new LockFile(siteWar.toFile());
if (!lf.lock()) {
throw new IOException("Cannot lock " + siteWar);
}

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitUtil.java
View File

@@ -21,7 +21,6 @@ import com.google.gerrit.common.Die;
import org.eclipse.jgit.internal.storage.file.LockFile;
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.SystemReader;
import java.io.ByteArrayInputStream;
@@ -162,7 +161,7 @@ public class InitUtil {
}
Files.createDirectories(dst.getParent());
LockFile lf = new LockFile(dst.toFile(), FS.DETECTED);
LockFile lf = new LockFile(dst.toFile());
if (!lf.lock()) {
throw new IOException("Cannot lock " + dst);
}

7
gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
View File

@@ -316,18 +316,17 @@ public class LocalDiskRepositoryManager implements GitRepositoryManager {
}
@Override
public void setProjectDescription(final Project.NameKey name,
final String description) {
public void setProjectDescription(Project.NameKey name, String description) {
// Update git's description file, in case gitweb is being used
//
try (Repository e = openRepository(name)) {
final String old = getProjectDescription(e);
String old = getProjectDescription(e);
if ((old == null && description == null)
|| (old != null && old.equals(description))) {
return;
}
final LockFile f = new LockFile(new File(e.getDirectory(), "description"), FS.DETECTED);
LockFile f = new LockFile(new File(e.getDirectory(), "description"));
if (f.lock()) {
String d = description;
if (d != null) {

6
gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
View File

@@ -229,12 +229,12 @@ public class SubmoduleOp {
boolean sameAuthorForAll = true;
try (Repository pdb = repoManager.openRepository(subscriber.getParentKey())) {
if (pdb.getRef(subscriber.get()) == null) {
if (pdb.exactRef(subscriber.get()) == null) {
throw new SubmoduleException(
"The branch was probably deleted from the subscriber repository");
}
DirCache dc = readTree(pdb, pdb.getRef(subscriber.get()));
DirCache dc = readTree(pdb, pdb.exactRef(subscriber.get()));
DirCacheEditor ed = dc.editor();
for (SubmoduleSubscription s : updates) {
@@ -308,7 +308,7 @@ public class SubmoduleOp {
ObjectId tree = dc.writeTree(oi);
ObjectId currentCommitId =
pdb.getRef(subscriber.get()).getObjectId();
pdb.exactRef(subscriber.get()).getObjectId();
CommitBuilder commit = new CommitBuilder();
commit.setTreeId(tree);

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

@@ -507,7 +507,7 @@ public class ListProjects implements RestReadView<TopLevelResource> {
Ref[] result = new Ref[showBranch.size()];
try (Repository git = repoManager.openRepository(projectName)) {
for (int i = 0; i < showBranch.size(); i++) {
Ref ref = git.getRef(showBranch.get(i));
Ref ref = git.findRef(showBranch.get(i));
if (ref != null
&& ref.getObjectId() != null
&& (projectControl.controlForRef(ref.getLeaf().getName()).isVisible())

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

@@ -93,7 +93,7 @@ public class DefaultSecureStore extends SecureStore {
if (FileUtil.modified(sec)) {
final byte[] out = Constants.encode(sec.toText());
final File path = sec.getFile();
final LockFile lf = new LockFile(path, FS.DETECTED);
final LockFile lf = new LockFile(path);
if (!lf.lock()) {
throw new IOException("Cannot lock " + path);
}

2
gerrit-server/src/test/java/com/google/gerrit/server/git/ProjectConfigTest.java
View File

@@ -258,7 +258,7 @@ public class ProjectConfigTest extends LocalDiskRepositoryTestCase {
md.setMessage("Edit\n");
cfg.commit(md);
Ref ref = db.getRef(RefNames.REFS_CONFIG);
Ref ref = db.exactRef(RefNames.REFS_CONFIG);
return util.getRevWalk().parseCommit(ref.getObjectId());
}
}

8
gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java
View File

@@ -559,12 +559,12 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
batch1 = update1.openUpdateInBatch(bru);
batch1.write(update1, new CommitBuilder());
batch1.commit();
assertThat(repo.getRef(update1.getRefName())).isNull();
assertThat(repo.exactRef(update1.getRefName())).isNull();
batch2 = update2.openUpdateInBatch(bru);
batch2.write(update2, new CommitBuilder());
batch2.commit();
assertThat(repo.getRef(update2.getRefName())).isNull();
assertThat(repo.exactRef(update2.getRefName())).isNull();
} finally {
if (batch1 != null) {
batch1.close();
@@ -586,8 +586,8 @@ public class ChangeNotesTest extends AbstractChangeNotesTest {
assertThat(cmds.get(0).getResult()).isEqualTo(ReceiveCommand.Result.OK);
assertThat(cmds.get(1).getResult()).isEqualTo(ReceiveCommand.Result.OK);
assertThat(repo.getRef(update1.getRefName())).isNotNull();
assertThat(repo.getRef(update2.getRefName())).isNotNull();
assertThat(repo.exactRef(update1.getRefName())).isNotNull();
assertThat(repo.exactRef(update2.getRefName())).isNotNull();
}
@Test

2
plugins/replication

Submodule plugins/replication updated: 4ab29b755a...e4aa03008f