mirror of
https://github.com/google/nomulus.git
synced 2025-07-19 17:26:09 +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,7 +21,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy;
|
|||
import static google.registry.model.registry.Registries.assertTldExists;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ComparisonChain;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.Ordering;
|
||||
|
@ -35,6 +34,7 @@ import google.registry.model.ImmutableObject;
|
|||
import google.registry.model.annotations.ReportedOn;
|
||||
import google.registry.model.registrar.Registrar;
|
||||
import google.registry.model.registry.Registry;
|
||||
import java.util.Optional;
|
||||
import org.joda.money.CurrencyUnit;
|
||||
import org.joda.time.DateTime;
|
||||
|
||||
|
@ -194,7 +194,7 @@ public final class RegistrarCredit extends ImmutableObject implements Buildable
|
|||
Registry.get(instance.tld).getCurrency().equals(instance.currency),
|
||||
"Credits must be in the currency of the assigned TLD");
|
||||
instance.description =
|
||||
Optional.fromNullable(instance.description).or(instance.getDefaultDescription());
|
||||
Optional.ofNullable(instance.description).orElse(instance.getDefaultDescription());
|
||||
return super.build();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue