zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 16:37:13 +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

10
java/google/registry/tools/RegistrarContactCommand.java
View file

@ -27,7 +27,6 @@ import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.common.base.Enums;
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 google.registry.model.common.GaeUserIdConverter;
@ -45,6 +44,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import javax.annotation.Nullable;
@ -240,10 +240,10 @@ final class RegistrarContactCommand extends MutatingCommand {
builder.setName(name);
builder.setEmailAddress(email);
if (phone != null) {
builder.setPhoneNumber(phone.orNull());
builder.setPhoneNumber(phone.orElse(null));
}
if (fax != null) {
builder.setFaxNumber(fax.orNull());
builder.setFaxNumber(fax.orElse(null));
}
builder.setTypes(nullToEmpty(contactTypes));
@ -276,10 +276,10 @@ final class RegistrarContactCommand extends MutatingCommand {
builder.setEmailAddress(email);
}
if (phone != null) {
builder.setPhoneNumber(phone.orNull());
builder.setPhoneNumber(phone.orElse(null));
}
if (fax != null) {
builder.setFaxNumber(fax.orNull());
builder.setFaxNumber(fax.orElse(null));
}
if (contactTypes != null) {
builder.setTypes(contactTypes);