zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-13 16:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Switch from Guava Optionals to Java 8 Optionals

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
java/google/registry/tools/CreateOrUpdateTldCommand.java
View file

@ -21,7 +21,6 @@ import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
import com.beust.jcommander.Parameter;
import com.google.common.base.CharMatcher;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedMap;
@ -39,6 +38,7 @@ import google.registry.tools.params.TransitionListParameter.BillingCostTransitio
import google.registry.tools.params.TransitionListParameter.TldStateTransitions;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import javax.annotation.Nullable;
import javax.inject.Inject;
@ -338,7 +338,7 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
}
if (driveFolderId != null) {
builder.setDriveFolderId(driveFolderId.orNull());
builder.setDriveFolderId(driveFolderId.orElse(null));
}
if (createBillingCost != null) {
@ -366,7 +366,7 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
}
if (lordnUsername != null) {
builder.setLordnUsername(lordnUsername.orNull());
builder.setLordnUsername(lordnUsername.orElse(null));
}
if (claimsPeriodEnd != null) {
@ -400,7 +400,7 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
}
if (lrpPeriod != null) {
builder.setLrpPeriod(lrpPeriod.orNull());
builder.setLrpPeriod(lrpPeriod.orElse(null));
}
ImmutableSet<String> newReservedListNames = getReservedLists(oldRegistry);