mirror of
https://github.com/google/nomulus
synced 2026-09-20 06:54:43 +00: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:
@@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assert_;
|
||||
|
||||
import com.google.appengine.tools.mapreduce.Input;
|
||||
import com.google.appengine.tools.mapreduce.InputReader;
|
||||
import com.google.common.base.Optional;
|
||||
import com.googlecode.objectify.Key;
|
||||
import google.registry.model.ofy.CommitLogBucket;
|
||||
import google.registry.model.ofy.CommitLogManifest;
|
||||
@@ -58,8 +57,7 @@ public final class CommitLogManifestInputTest {
|
||||
created.add(createManifest(CommitLogBucket.getBucketKey(i), DATE_TIME_OLD));
|
||||
}
|
||||
List<Key<CommitLogManifest>> seen = new ArrayList<>();
|
||||
Input<Key<CommitLogManifest>> input =
|
||||
new CommitLogManifestInput(Optional.of(DATE_TIME_THRESHOLD));
|
||||
Input<Key<CommitLogManifest>> input = new CommitLogManifestInput(DATE_TIME_THRESHOLD);
|
||||
for (InputReader<Key<CommitLogManifest>> reader
|
||||
: input.createReaders()) {
|
||||
reader.beginShard();
|
||||
@@ -84,8 +82,7 @@ public final class CommitLogManifestInputTest {
|
||||
old.add(createManifest(CommitLogBucket.getBucketKey(i), DATE_TIME_OLD2));
|
||||
}
|
||||
List<Key<CommitLogManifest>> seen = new ArrayList<>();
|
||||
Input<Key<CommitLogManifest>> input =
|
||||
new CommitLogManifestInput(Optional.of(DATE_TIME_THRESHOLD));
|
||||
Input<Key<CommitLogManifest>> input = new CommitLogManifestInput(DATE_TIME_THRESHOLD);
|
||||
for (InputReader<Key<CommitLogManifest>> reader
|
||||
: input.createReaders()) {
|
||||
reader.beginShard();
|
||||
@@ -111,7 +108,7 @@ public final class CommitLogManifestInputTest {
|
||||
created.add(createManifest(CommitLogBucket.getBucketKey(i), DATE_TIME_OLD2));
|
||||
}
|
||||
List<Key<CommitLogManifest>> seen = new ArrayList<>();
|
||||
Input<Key<CommitLogManifest>> input = new CommitLogManifestInput(Optional.<DateTime>absent());
|
||||
Input<Key<CommitLogManifest>> input = new CommitLogManifestInput();
|
||||
for (InputReader<Key<CommitLogManifest>> reader
|
||||
: input.createReaders()) {
|
||||
reader.beginShard();
|
||||
|
||||
Reference in New Issue
Block a user