mirror of
https://github.com/google/nomulus
synced 2026-08-18 21:26:16 +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:
@@ -28,12 +28,12 @@ import static java.util.stream.Collectors.toCollection;
|
||||
|
||||
import com.beust.jcommander.Parameter;
|
||||
import com.beust.jcommander.Parameters;
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Streams;
|
||||
import google.registry.model.registrar.Registrar;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
/** Command to create a Registrar. */
|
||||
@@ -65,7 +65,7 @@ final class CreateRegistrarCommand extends CreateOrUpdateRegistrarCommand
|
||||
checkArgumentNotNull(icannReferralEmail, "--icann_referral_email is a required field");
|
||||
checkArgumentNotNull(street, "Address fields are required when creating a registrar");
|
||||
// Default new registrars to active.
|
||||
registrarState = Optional.fromNullable(registrarState).or(ACTIVE);
|
||||
registrarState = Optional.ofNullable(registrarState).orElse(ACTIVE);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
|
||||
Reference in New Issue
Block a user