opendev/gerrit
Code Issues Proposed changes

Replace Guava's Predicates.notNull() with Objects::nonNull

Browse Source 
Change-Id: Iaceaca60936d29cd66df4f2fe233fd5def244e89
This commit is contained in:
Dave Borowitz
2019-05-16 16:04:47 +02:00
committed by David Pursehouse
parent 1381860bd1
commit 14198f958d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/index/Schema.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.index;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.base.Predicates;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
@@ -26,6 +25,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.Optional; import java.util.Optional;
/** Specific version of a secondary index schema. */ /** Specific version of a secondary index schema. */
@@ -191,7 +191,7 @@ public class Schema<T> {
return new Values<>(f, Collections.singleton(v)); return new Values<>(f, Collections.singleton(v));
} }
}) })
.filter(Predicates.notNull()); .filter(Objects::nonNull);
} }
@Override @Override

4
java/com/google/gerrit/server/index/account/AccountField.java
View File

@@ -21,7 +21,6 @@ import static com.google.gerrit.index.FieldDef.storedOnly;
import static com.google.gerrit.index.FieldDef.timestamp; import static com.google.gerrit.index.FieldDef.timestamp;
import static java.util.stream.Collectors.toSet; import static java.util.stream.Collectors.toSet;
import com.google.common.base.Predicates;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
@@ -36,6 +35,7 @@ import java.sql.Timestamp;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Locale; import java.util.Locale;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
@@ -96,7 +96,7 @@ public class AccountField {
FluentIterable.from(a.getExternalIds()) FluentIterable.from(a.getExternalIds())
.transform(ExternalId::email) .transform(ExternalId::email)
.append(Collections.singleton(a.getAccount().getPreferredEmail())) .append(Collections.singleton(a.getAccount().getPreferredEmail()))
.filter(Predicates.notNull()) .filter(Objects::nonNull)
.transform(String::toLowerCase) .transform(String::toLowerCase)
.toSet()); .toSet());