diff --git a/java/google/registry/export/sheet/SyncRegistrarsSheet.java b/java/google/registry/export/sheet/SyncRegistrarsSheet.java index f7d4a3580..581f6ca0f 100644 --- a/java/google/registry/export/sheet/SyncRegistrarsSheet.java +++ b/java/google/registry/export/sheet/SyncRegistrarsSheet.java @@ -28,7 +28,6 @@ import static google.registry.model.registrar.RegistrarContact.Type.WHOIS; import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.base.Joiner; -import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; @@ -40,6 +39,7 @@ import google.registry.model.registrar.RegistrarContact; import google.registry.util.Clock; import google.registry.util.DateTimeUtils; import java.io.IOException; +import java.util.function.Predicate; import javax.annotation.Nullable; import javax.inject.Inject; import org.joda.time.DateTime; @@ -162,7 +162,7 @@ class SyncRegistrarsSheet { StringBuilder result = new StringBuilder(); boolean first = true; for (RegistrarContact contact : contacts) { - if (!filter.apply(contact)) { + if (!filter.test(contact)) { continue; } if (first) { diff --git a/java/google/registry/flows/ResourceFlowUtils.java b/java/google/registry/flows/ResourceFlowUtils.java index 08220a696..a63501742 100644 --- a/java/google/registry/flows/ResourceFlowUtils.java +++ b/java/google/registry/flows/ResourceFlowUtils.java @@ -24,7 +24,6 @@ import static google.registry.model.domain.DomainResource.extendRegistrationWith import static google.registry.model.index.ForeignKeyIndex.loadAndGetKey; import static google.registry.model.ofy.ObjectifyService.ofy; -import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -67,6 +66,7 @@ import java.util.List; import java.util.Optional; import java.util.Set; import java.util.function.Function; +import java.util.function.Predicate; import org.joda.time.DateTime; /** Static utility functions for resource flows. */ diff --git a/java/google/registry/model/domain/DomainBase.java b/java/google/registry/model/domain/DomainBase.java index 4270da027..e777ed50d 100644 --- a/java/google/registry/model/domain/DomainBase.java +++ b/java/google/registry/model/domain/DomainBase.java @@ -15,7 +15,6 @@ package google.registry.model.domain; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Predicates.not; import static com.google.common.base.Strings.emptyToNull; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet; @@ -30,7 +29,6 @@ import static google.registry.util.DomainNameUtils.canonicalizeDomainName; import static google.registry.util.DomainNameUtils.getTldFromDomainName; import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; -import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Ordering; @@ -47,6 +45,7 @@ import google.registry.model.domain.launch.LaunchNotice; import google.registry.model.domain.secdns.DelegationSignerData; import google.registry.model.host.HostResource; import java.util.Set; +import java.util.function.Predicate; import java.util.stream.Stream; /** Shared base class for {@link DomainResource} and {@link DomainApplication}. */ @@ -154,7 +153,10 @@ public abstract class DomainBase extends EppResource { /** Associated contacts for the domain (other than registrant). */ public ImmutableSet getContacts() { - return nullToEmpty(allContacts).stream().filter(not(IS_REGISTRANT)).collect(toImmutableSet()); + return nullToEmpty(allContacts) + .stream() + .filter(IS_REGISTRANT.negate()) + .collect(toImmutableSet()); } public DomainAuthInfo getAuthInfo() { diff --git a/java/google/registry/model/ofy/TransactionInfo.java b/java/google/registry/model/ofy/TransactionInfo.java index 2a369ea61..0773007df 100644 --- a/java/google/registry/model/ofy/TransactionInfo.java +++ b/java/google/registry/model/ofy/TransactionInfo.java @@ -21,8 +21,6 @@ import static com.google.common.collect.Maps.toMap; import static google.registry.model.ofy.CommitLogBucket.getArbitraryBucketId; import static google.registry.model.ofy.ObjectifyService.ofy; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.googlecode.objectify.Key; @@ -32,8 +30,6 @@ import org.joda.time.DateTime; /** Metadata for an {@link Ofy} transaction that saves commit logs. */ class TransactionInfo { - private static final Predicate IS_DELETE = Predicates.equalTo(Delete.SENTINEL); - private enum Delete { SENTINEL } /** Logical "now" of the transaction. */ @@ -75,7 +71,7 @@ class TransactionInfo { void putDeletes(Iterable> keys) { assertNotReadOnly(); - changesBuilder.putAll(toMap(keys, k -> TransactionInfo.Delete.SENTINEL)); + changesBuilder.putAll(toMap(keys, k -> Delete.SENTINEL)); } ImmutableSet> getTouchedKeys() { @@ -83,7 +79,8 @@ class TransactionInfo { } ImmutableSet> getDeletes() { - return ImmutableSet.copyOf(filterValues(changesBuilder.build(), IS_DELETE).keySet()); + return ImmutableSet.copyOf( + filterValues(changesBuilder.build(), Delete.SENTINEL::equals).keySet()); } ImmutableSet getSaves() { @@ -91,7 +88,7 @@ class TransactionInfo { .build() .values() .stream() - .filter(Predicates.not(IS_DELETE)) + .filter(change -> !Delete.SENTINEL.equals(change)) .collect(toImmutableSet()); } } diff --git a/java/google/registry/model/registry/Registry.java b/java/google/registry/model/registry/Registry.java index 1ecf46c09..4d7214538 100644 --- a/java/google/registry/model/registry/Registry.java +++ b/java/google/registry/model/registry/Registry.java @@ -30,7 +30,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.joda.money.CurrencyUnit.USD; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Predicate; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -67,6 +66,7 @@ import java.util.Collection; import java.util.Map.Entry; import java.util.Optional; import java.util.Set; +import java.util.function.Predicate; import java.util.regex.Pattern; import javax.annotation.Nullable; import org.joda.money.CurrencyUnit; diff --git a/java/google/registry/tools/server/VerifyOteAction.java b/java/google/registry/tools/server/VerifyOteAction.java index af3c370a2..ebe406328 100644 --- a/java/google/registry/tools/server/VerifyOteAction.java +++ b/java/google/registry/tools/server/VerifyOteAction.java @@ -15,7 +15,6 @@ package google.registry.tools.server; import static com.google.common.base.Predicates.equalTo; -import static com.google.common.base.Predicates.not; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Maps.toMap; import static google.registry.flows.EppXmlTransformer.unmarshal; @@ -25,7 +24,6 @@ import static google.registry.util.DomainNameUtils.ACE_PREFIX; import com.google.common.base.Ascii; import com.google.common.base.Joiner; -import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.FluentIterable; import com.google.common.collect.HashMultiset; @@ -51,6 +49,7 @@ import java.util.EnumSet; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.function.Predicate; import java.util.stream.Stream; import javax.inject.Inject; @@ -147,13 +146,13 @@ public class VerifyOteAction implements Runnable, JsonAction { CONTACT_UPDATES(0, equalTo(Type.CONTACT_UPDATE)), DOMAIN_APPLICATION_CREATES(0, equalTo(Type.DOMAIN_APPLICATION_CREATE)), DOMAIN_APPLICATION_CREATES_LANDRUSH( - 1, equalTo(Type.DOMAIN_APPLICATION_CREATE), not(IS_SUNRISE)), + 1, equalTo(Type.DOMAIN_APPLICATION_CREATE), IS_SUNRISE.negate()), DOMAIN_APPLICATION_CREATES_SUNRISE(1, equalTo(Type.DOMAIN_APPLICATION_CREATE), IS_SUNRISE), DOMAIN_APPLICATION_DELETES(2, equalTo(Type.DOMAIN_APPLICATION_DELETE)), DOMAIN_APPLICATION_UPDATES(2, equalTo(Type.DOMAIN_APPLICATION_UPDATE)), DOMAIN_AUTORENEWS(0, equalTo(Type.DOMAIN_AUTORENEW)), DOMAIN_CREATES(0, equalTo(Type.DOMAIN_CREATE)), - DOMAIN_CREATES_ASCII(1, equalTo(Type.DOMAIN_CREATE), not(IS_IDN)), + DOMAIN_CREATES_ASCII(1, equalTo(Type.DOMAIN_CREATE), IS_IDN.negate()), DOMAIN_CREATES_IDN(1, equalTo(Type.DOMAIN_CREATE), IS_IDN), DOMAIN_CREATES_WITH_CLAIMS_NOTICE(1, equalTo(Type.DOMAIN_CREATE), HAS_CLAIMS_NOTICE), DOMAIN_CREATES_WITH_FEE( @@ -161,7 +160,7 @@ public class VerifyOteAction implements Runnable, JsonAction { equalTo(Type.DOMAIN_CREATE), eppInput -> eppInput.getSingleExtension(FeeCreateCommandExtension.class) != null), DOMAIN_CREATES_WITH_SEC_DNS(1, equalTo(Type.DOMAIN_CREATE), HAS_SEC_DNS), - DOMAIN_CREATES_WITHOUT_SEC_DNS(0, equalTo(Type.DOMAIN_CREATE), not(HAS_SEC_DNS)), + DOMAIN_CREATES_WITHOUT_SEC_DNS(0, equalTo(Type.DOMAIN_CREATE), HAS_SEC_DNS.negate()), DOMAIN_DELETES(2, equalTo(Type.DOMAIN_DELETE)), DOMAIN_RENEWS(0, equalTo(Type.DOMAIN_RENEW)), DOMAIN_RESTORES(1, equalTo(Type.DOMAIN_RESTORE)), @@ -171,9 +170,9 @@ public class VerifyOteAction implements Runnable, JsonAction { DOMAIN_TRANSFER_REQUESTS(1, equalTo(Type.DOMAIN_TRANSFER_REQUEST)), DOMAIN_UPDATES(0, equalTo(Type.DOMAIN_UPDATE)), DOMAIN_UPDATES_WITH_SEC_DNS(1, equalTo(Type.DOMAIN_UPDATE), HAS_SEC_DNS), - DOMAIN_UPDATES_WITHOUT_SEC_DNS(0, equalTo(Type.DOMAIN_UPDATE), not(HAS_SEC_DNS)), + DOMAIN_UPDATES_WITHOUT_SEC_DNS(0, equalTo(Type.DOMAIN_UPDATE), HAS_SEC_DNS.negate()), HOST_CREATES(0, equalTo(Type.HOST_CREATE)), - HOST_CREATES_EXTERNAL(0, equalTo(Type.HOST_CREATE), not(IS_SUBORDINATE)), + HOST_CREATES_EXTERNAL(0, equalTo(Type.HOST_CREATE), IS_SUBORDINATE.negate()), HOST_CREATES_SUBORDINATE(1, equalTo(Type.HOST_CREATE), IS_SUBORDINATE), HOST_DELETES(1, equalTo(Type.HOST_DELETE)), HOST_UPDATES(1, equalTo(Type.HOST_UPDATE)), @@ -221,9 +220,9 @@ public class VerifyOteAction implements Runnable, JsonAction { */ boolean matches(HistoryEntry.Type historyType, Optional eppInput) { if (eppInputFilter.isPresent() && eppInput.isPresent()) { - return typeFilter.apply(historyType) && eppInputFilter.get().apply(eppInput.get()); + return typeFilter.test(historyType) && eppInputFilter.get().test(eppInput.get()); } else { - return typeFilter.apply(historyType); + return typeFilter.test(historyType); } } } diff --git a/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java b/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java index 79ee662e6..203dd311a 100644 --- a/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java +++ b/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java @@ -20,7 +20,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.security.JsonResponseHelper.Status.ERROR; import static google.registry.security.JsonResponseHelper.Status.SUCCESS; -import com.google.common.base.Predicate; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -51,6 +50,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.function.Predicate; import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; diff --git a/java/google/registry/util/PredicateUtils.java b/java/google/registry/util/PredicateUtils.java index aafac6645..4e0ea865a 100644 --- a/java/google/registry/util/PredicateUtils.java +++ b/java/google/registry/util/PredicateUtils.java @@ -14,7 +14,7 @@ package google.registry.util; -import com.google.common.base.Predicate; +import java.util.function.Predicate; /** Utility class containing {@link Predicate} methods. */ public class PredicateUtils { @@ -34,7 +34,7 @@ public class PredicateUtils { } @Override - public boolean apply(Class superClass) { + public boolean test(Class superClass) { return superClass.isAssignableFrom(subClass); } } diff --git a/java/google/registry/util/Retrier.java b/java/google/registry/util/Retrier.java index f7ed818f9..608210a0b 100644 --- a/java/google/registry/util/Retrier.java +++ b/java/google/registry/util/Retrier.java @@ -19,11 +19,11 @@ import static com.google.common.base.Throwables.throwIfUnchecked; import static com.google.common.math.IntMath.pow; import static google.registry.util.PredicateUtils.supertypeOf; -import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; import java.io.Serializable; import java.util.Set; import java.util.concurrent.Callable; +import java.util.function.Predicate; import javax.inject.Inject; import javax.inject.Named; import org.joda.time.Duration; @@ -88,7 +88,7 @@ public class Retrier implements Serializable { try { return callable.call(); } catch (Throwable e) { - if (++failures == attempts || !isRetryable.apply(e)) { + if (++failures == attempts || !isRetryable.test(e)) { failureReporter.afterFinalFailure(e, failures); throwIfUnchecked(e); throw new RuntimeException(e); diff --git a/javatests/google/registry/testing/TaskQueueHelper.java b/javatests/google/registry/testing/TaskQueueHelper.java index f2d0832a2..52386008c 100644 --- a/javatests/google/registry/testing/TaskQueueHelper.java +++ b/javatests/google/registry/testing/TaskQueueHelper.java @@ -33,12 +33,10 @@ import com.google.appengine.api.taskqueue.dev.QueueStateInfo.HeaderWrapper; import com.google.appengine.api.taskqueue.dev.QueueStateInfo.TaskStateInfo; import com.google.common.base.Ascii; import com.google.common.base.Joiner; -import com.google.common.base.Predicate; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableMultiset; -import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.net.HttpHeaders; @@ -55,6 +53,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Objects; import java.util.function.Function; +import java.util.function.Predicate; import javax.annotation.Nonnull; import org.joda.time.Duration; @@ -156,7 +155,7 @@ public class TaskQueueHelper { * TaskStateInfo). */ @Override - public boolean apply(@Nonnull TaskStateInfo info) { + public boolean test(@Nonnull TaskStateInfo info) { MatchableTaskInfo actual = new MatchableTaskInfo(info); return (expected.taskName == null || Objects.equals(expected.taskName, actual.taskName)) && (expected.url == null || Objects.equals(expected.url, actual.url)) @@ -241,7 +240,7 @@ public class TaskQueueHelper { LinkedList taskInfos = new LinkedList<>(qsi.getTaskInfo()); for (final TaskMatcher taskMatcher : taskMatchers) { try { - taskInfos.remove(Iterables.find(taskInfos, taskMatcher)); + taskInfos.remove(taskInfos.stream().filter(taskMatcher).findFirst().get()); } catch (NoSuchElementException e) { final Map taskMatcherMap = taskMatcher.expected.toMap(); assert_()