opendev/gerrit
Code Issues Proposed changes

Fix deprecation warnings caused by Guava upgrade

Browse Source 
Replace Objects.firstNonNull() with MoreObjects.firstNonNull().

Change-Id: I657a532562ca598aca4130f4e55fdfde72fa4434
This commit is contained in:
David Ostrovsky
2014-09-08 16:15:33 +02:00
committed by David Pursehouse
parent 7d76f7d348
commit ac332d22f5
56 changed files with 135 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.server.git;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.eclipse.jgit.dircache.DirCache;
@@ -308,8 +309,8 @@ public abstract class VersionedMetaData {
if (Objects.equal(src, expected)) {
return revision;
}
return updateRef(Objects.firstNonNull(expected, ObjectId.zeroId()), src,
getRefName());
return updateRef(MoreObjects.firstNonNull(expected, ObjectId.zeroId()),
src, getRefName());
}
@Override