mirror of
https://github.com/google/nomulus.git
synced 2025-07-02 17:23:32 +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
|
@ -21,11 +21,11 @@ import static com.google.common.html.HtmlEscapers.htmlEscaper;
|
|||
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.base.Joiner;
|
||||
import com.google.common.base.Optional;
|
||||
import google.registry.model.eppcommon.Address;
|
||||
import google.registry.util.Idn;
|
||||
import google.registry.xml.UtcDateTimeAdapter;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import javax.annotation.Nullable;
|
||||
import org.joda.time.DateTime;
|
||||
|
@ -64,9 +64,9 @@ abstract class WhoisResponseImpl implements WhoisResponse {
|
|||
static <T> T chooseByUnicodePreference(
|
||||
boolean preferUnicode, @Nullable T localized, @Nullable T internationalized) {
|
||||
if (preferUnicode) {
|
||||
return Optional.fromNullable(localized).or(Optional.fromNullable(internationalized)).orNull();
|
||||
return Optional.ofNullable(localized).orElse(internationalized);
|
||||
} else {
|
||||
return Optional.fromNullable(internationalized).or(Optional.fromNullable(localized)).orNull();
|
||||
return Optional.ofNullable(internationalized).orElse(localized);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue