mirror of
https://github.com/google/nomulus.git
synced 2025-05-21 11:49:37 +02: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:
parent
184b2b56ac
commit
c0f8da0c6e
581 changed files with 1325 additions and 932 deletions
|
@ -26,7 +26,6 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
|
|||
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
|
||||
import static javax.servlet.http.HttpServletResponse.SC_OK;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.net.InternetDomainName;
|
||||
import com.google.common.net.MediaType;
|
||||
|
@ -54,6 +53,7 @@ import java.net.URI;
|
|||
import java.net.URISyntaxException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import javax.annotation.Nullable;
|
||||
import javax.inject.Inject;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
@ -196,7 +196,7 @@ public abstract class RdapActionBase implements Runnable {
|
|||
*/
|
||||
boolean shouldIncludeDeleted() {
|
||||
// If includeDeleted is not specified, or set to false, we don't need to go any further.
|
||||
if (!includeDeletedParam.or(false)) {
|
||||
if (!includeDeletedParam.orElse(false)) {
|
||||
return false;
|
||||
}
|
||||
if (!authResult.userAuthInfo().isPresent()) {
|
||||
|
|
|
@ -21,7 +21,6 @@ import static google.registry.request.Action.Method.GET;
|
|||
import static google.registry.request.Action.Method.HEAD;
|
||||
import static google.registry.util.DateTimeUtils.END_OF_TIME;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.ImmutableSortedSet;
|
||||
|
@ -48,6 +47,7 @@ import java.net.InetAddress;
|
|||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import javax.inject.Inject;
|
||||
import org.joda.time.DateTime;
|
||||
|
||||
|
|
|
@ -19,7 +19,6 @@ import static google.registry.rdap.RdapUtils.getRegistrarByIanaIdentifier;
|
|||
import static google.registry.request.Action.Method.GET;
|
||||
import static google.registry.request.Action.Method.HEAD;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.primitives.Longs;
|
||||
import com.google.re2j.Pattern;
|
||||
|
@ -33,6 +32,7 @@ import google.registry.request.HttpException.BadRequestException;
|
|||
import google.registry.request.HttpException.NotFoundException;
|
||||
import google.registry.request.auth.Auth;
|
||||
import google.registry.util.Clock;
|
||||
import java.util.Optional;
|
||||
import javax.inject.Inject;
|
||||
import org.joda.time.DateTime;
|
||||
|
||||
|
@ -89,7 +89,7 @@ public class RdapEntityAction extends RdapActionBase {
|
|||
return rdapJsonFormatter.makeRdapJsonForContact(
|
||||
contactResource,
|
||||
true,
|
||||
Optional.<DesignatedContact.Type>absent(),
|
||||
Optional.<DesignatedContact.Type>empty(),
|
||||
rdapLinkBase,
|
||||
rdapWhoisServer,
|
||||
now,
|
||||
|
|
|
@ -20,7 +20,6 @@ import static google.registry.rdap.RdapUtils.getRegistrarByIanaIdentifier;
|
|||
import static google.registry.request.Action.Method.GET;
|
||||
import static google.registry.request.Action.Method.HEAD;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.Streams;
|
||||
|
@ -42,6 +41,7 @@ import google.registry.request.auth.Auth;
|
|||
import google.registry.util.Clock;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import javax.inject.Inject;
|
||||
import org.joda.time.DateTime;
|
||||
|
||||
|
@ -298,7 +298,7 @@ public class RdapEntitySearchAction extends RdapActionBase {
|
|||
jsonOutputList.add(rdapJsonFormatter.makeRdapJsonForContact(
|
||||
contact,
|
||||
false,
|
||||
Optional.<DesignatedContact.Type>absent(),
|
||||
Optional.<DesignatedContact.Type>empty(),
|
||||
rdapLinkBase,
|
||||
rdapWhoisServer,
|
||||
now,
|
||||
|
|
|
@ -22,7 +22,6 @@ import static google.registry.util.CollectionUtils.union;
|
|||
import static google.registry.util.DomainNameUtils.ACE_PREFIX;
|
||||
|
||||
import com.google.common.base.Functions;
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.base.Predicates;
|
||||
import com.google.common.collect.FluentIterable;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
@ -60,6 +59,7 @@ import java.net.URI;
|
|||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import javax.annotation.Nullable;
|
||||
import javax.inject.Inject;
|
||||
import javax.inject.Singleton;
|
||||
|
|
|
@ -14,12 +14,12 @@
|
|||
|
||||
package google.registry.rdap;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import dagger.Module;
|
||||
import dagger.Provides;
|
||||
import google.registry.request.Parameter;
|
||||
import google.registry.request.RequestParameters;
|
||||
import java.net.InetAddress;
|
||||
import java.util.Optional;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/** Dagger module for the RDAP package. */
|
||||
|
|
|
@ -18,7 +18,6 @@ import static google.registry.model.EppResourceUtils.loadByForeignKey;
|
|||
import static google.registry.request.Action.Method.GET;
|
||||
import static google.registry.request.Action.Method.HEAD;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.ImmutableSortedSet;
|
||||
|
@ -41,6 +40,7 @@ import google.registry.util.Idn;
|
|||
import java.net.InetAddress;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import javax.inject.Inject;
|
||||
import org.joda.time.DateTime;
|
||||
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue