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

4
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
View File

@@ -16,7 +16,7 @@ package com.google.gerrit.server.query.change;
import static com.google.gerrit.server.ApprovalsUtil.sortApprovals;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
@@ -553,7 +553,7 @@ public class ChangeData {
@Override
public String toString() {
return Objects.toStringHelper(this).addValue(getId()).toString();
return MoreObjects.toStringHelper(this).addValue(getId()).toString();
}
public static class ChangedLines {

4
gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java
View File

@@ -14,7 +14,7 @@
package com.google.gerrit.server.query.change;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.gerrit.common.data.GlobalCapability;
@@ -416,7 +416,7 @@ public class QueryProcessor {
}
private int limit(Predicate<ChangeData> s) {
int n = Objects.firstNonNull(ChangeQueryBuilder.getLimit(s), maxLimit);
int n = MoreObjects.firstNonNull(ChangeQueryBuilder.getLimit(s), maxLimit);
return limit > 0 ? Math.min(n, limit) + 1 : n + 1;
}