1
0
mirror of https://github.com/google/nomulus synced 2026-05-23 00:01:58 +00:00

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

@@ -16,9 +16,9 @@ package google.registry.whois;
import static google.registry.model.EppResourceUtils.loadByForeignKey;
import com.google.common.base.Optional;
import com.google.common.net.InternetDomainName;
import google.registry.model.host.HostResource;
import java.util.Optional;
import org.joda.time.DateTime;
/** Represents a WHOIS lookup on a nameserver based on its hostname. */
@@ -32,7 +32,7 @@ public class NameserverLookupByHostCommand extends DomainOrHostLookupCommand {
protected Optional<WhoisResponse> getResponse(InternetDomainName hostName, DateTime now) {
final HostResource hostResource =
loadByForeignKey(HostResource.class, hostName.toString(), now);
return Optional.<WhoisResponse>fromNullable(
return Optional.<WhoisResponse>ofNullable(
hostResource == null ? null : new NameserverWhoisResponse(hostResource, now));
}
}