Switch from Guava Optionals to Java 8 Optionals

This was a surprisingly involved change. Some of the difficulties included
java.util.Optional purposely not being Serializable (so I had to move a
few Optionals in mapreduce classes to @Nullable) and having to add the Truth
Java8 extension library for assertion support.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171863777
This commit is contained in:
mcilwain 2017-10-11 13:09:26 -07:00 committed by jianglai
parent 184b2b56ac
commit c0f8da0c6e
581 changed files with 1325 additions and 932 deletions

View file

@ -14,10 +14,10 @@
package google.registry.rdap;
import static com.google.common.collect.Iterables.tryFind;
import com.google.common.base.Optional;
import com.google.common.collect.Streams;
import google.registry.model.registrar.Registrar;
import java.util.Objects;
import java.util.Optional;
/** Utility functions for RDAP. */
public final class RdapUtils {
@ -26,11 +26,8 @@ public final class RdapUtils {
/** Looks up a registrar by its IANA identifier. */
static Optional<Registrar> getRegistrarByIanaIdentifier(final long ianaIdentifier) {
return tryFind(
Registrar.loadAllCached(),
registrar -> {
Long registrarIanaIdentifier = registrar.getIanaIdentifier();
return (registrarIanaIdentifier != null) && (registrarIanaIdentifier == ianaIdentifier);
});
return Streams.stream(Registrar.loadAllCached())
.filter(registrar -> Objects.equals(ianaIdentifier, registrar.getIanaIdentifier()))
.findFirst();
}
}