mirror of
https://github.com/google/nomulus.git
synced 2025-05-14 16:37:13 +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
|
@ -17,11 +17,11 @@ package google.registry.testing;
|
|||
import static com.google.common.base.Preconditions.checkNotNull;
|
||||
import static com.google.common.base.Preconditions.checkState;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import javax.annotation.Nullable;
|
||||
import org.junit.rules.ExternalResource;
|
||||
|
||||
|
@ -65,8 +65,8 @@ public final class SystemPropertyRule extends ExternalResource {
|
|||
*/
|
||||
public SystemPropertyRule override(String key, @Nullable String value) {
|
||||
originals.computeIfAbsent(
|
||||
key, k -> new Property(k, Optional.fromNullable(System.getProperty(k))));
|
||||
Property property = new Property(key, Optional.fromNullable(value));
|
||||
key, k -> new Property(k, Optional.ofNullable(System.getProperty(k))));
|
||||
Property property = new Property(key, Optional.ofNullable(value));
|
||||
if (isRunning) {
|
||||
property.set();
|
||||
} else {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue