Fix deprecation warnings caused by Guava upgrade

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

View File

@@ -16,7 +16,7 @@ package com.google.gerrit.sshd.commands;
import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.config.ConfigResource;
@@ -108,7 +108,7 @@ final class ShowQueue extends SshCommand {
stdout.print(String.format("%8s %-12s %-4s %s\n",
task.id, start, startTime(task.startTime),
Objects.firstNonNull(remoteName, "n/a")));
MoreObjects.firstNonNull(remoteName, "n/a")));
}
}
stdout.print("----------------------------------------------"