From 9ed4d43f41f2ef311061fcb879d0742b51395fc7 Mon Sep 17 00:00:00 2001 From: guyben Date: Wed, 18 Apr 2018 11:18:05 -0700 Subject: [PATCH] Use Predicates.not for one-liner functionals when appropriate ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=193386976 --- java/google/registry/cron/TldFanoutAction.java | 2 +- java/google/registry/model/ofy/TransactionInfo.java | 3 ++- java/google/registry/rdap/RdapJsonFormatter.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/java/google/registry/cron/TldFanoutAction.java b/java/google/registry/cron/TldFanoutAction.java index 2a601493e..c8aba6f16 100644 --- a/java/google/registry/cron/TldFanoutAction.java +++ b/java/google/registry/cron/TldFanoutAction.java @@ -131,7 +131,7 @@ public final class TldFanoutAction implements Runnable { runInEmpty ? Stream.of("") : Stream.of(), forEachRealTld ? getTldsOfType(REAL).stream() : Stream.of(), forEachTestTld ? getTldsOfType(TEST).stream() : Stream.of()) - .filter(tld -> !excludes.contains(tld)) + .filter(not(in(excludes))) .collect(toImmutableSet()); Multimap flowThruParams = filterKeys(params, not(in(CONTROL_PARAMS))); Queue taskQueue = getQueue(queue); diff --git a/java/google/registry/model/ofy/TransactionInfo.java b/java/google/registry/model/ofy/TransactionInfo.java index 0773007df..33be2e018 100644 --- a/java/google/registry/model/ofy/TransactionInfo.java +++ b/java/google/registry/model/ofy/TransactionInfo.java @@ -15,6 +15,7 @@ package google.registry.model.ofy; import static com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Predicates.not; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.collect.Maps.filterValues; import static com.google.common.collect.Maps.toMap; @@ -88,7 +89,7 @@ class TransactionInfo { .build() .values() .stream() - .filter(change -> !Delete.SENTINEL.equals(change)) + .filter(not(Delete.SENTINEL::equals)) .collect(toImmutableSet()); } } diff --git a/java/google/registry/rdap/RdapJsonFormatter.java b/java/google/registry/rdap/RdapJsonFormatter.java index fab91dc21..b2698de36 100644 --- a/java/google/registry/rdap/RdapJsonFormatter.java +++ b/java/google/registry/rdap/RdapJsonFormatter.java @@ -14,6 +14,7 @@ package google.registry.rdap; +import static com.google.common.base.Predicates.not; import static com.google.common.base.Strings.nullToEmpty; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet; @@ -57,7 +58,6 @@ import java.net.URI; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.stream.Stream; import javax.annotation.Nullable; @@ -1153,7 +1153,7 @@ public class RdapJsonFormatter { if (isDeleted) { stream = Streams.concat( - stream.filter(rdapStatus -> !Objects.equals(rdapStatus, RdapStatus.ACTIVE)), + stream.filter(not(RdapStatus.ACTIVE::equals)), Stream.of(RdapStatus.INACTIVE)); } return stream