zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-13 07:57:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use some Java 8 features in commit log code

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=190985373
This commit is contained in:
mcilwain 2018-03-29 14:21:14 -07:00 • committed by jianglai
parent c40eda3235
commit 54a8cd09ea
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
java/google/registry/backup/CommitLogCheckpointStrategy.java
View file

@ -116,13 +116,12 @@ class CommitLogCheckpointStrategy {
ImmutableMap<Integer, DateTime> readBucketTimestamps() { ImmutableMap<Integer, DateTime> readBucketTimestamps() {
// Use a fresh session cache so that we get the latest data from Datastore. // Use a fresh session cache so that we get the latest data from Datastore.
return ofy.doWithFreshSessionCache( return ofy.doWithFreshSessionCache(
() -> { () ->
ImmutableMap.Builder<Integer, DateTime> results = new ImmutableMap.Builder<>(); CommitLogBucket.loadAllBuckets()
for (CommitLogBucket bucket : CommitLogBucket.loadAllBuckets()) { .stream()
results.put(bucket.getBucketNum(), bucket.getLastWrittenTime()); .collect(
} ImmutableMap.toImmutableMap(
return results.build(); CommitLogBucket::getBucketNum, CommitLogBucket::getLastWrittenTime)));
});
} }
/** /**

4
java/google/registry/model/ofy/CommitLogBucket.java
View file

@ -21,7 +21,6 @@ import static google.registry.config.RegistryConfig.getCommitLogBucketCount;
import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.util.DateTimeUtils.START_OF_TIME; import static google.registry.util.DateTimeUtils.START_OF_TIME;
import com.google.common.base.Supplier;
import com.google.common.collect.ContiguousSet; import com.google.common.collect.ContiguousSet;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.ImmutableSortedSet;
@ -36,6 +35,7 @@ import google.registry.model.annotations.NotBackedUp;
import google.registry.model.annotations.NotBackedUp.Reason; import google.registry.model.annotations.NotBackedUp.Reason;
import google.registry.util.NonFinalForTesting; import google.registry.util.NonFinalForTesting;
import java.util.Random; import java.util.Random;
import java.util.function.Supplier;
import org.joda.time.DateTime; import org.joda.time.DateTime;
/** /**
@ -119,7 +119,7 @@ public class CommitLogBucket extends ImmutableObject implements Buildable {
/** Returns the loaded bucket for the given key, or a new object if the bucket doesn't exist. */ /** Returns the loaded bucket for the given key, or a new object if the bucket doesn't exist. */
public static CommitLogBucket loadBucket(Key<CommitLogBucket> bucketKey) { public static CommitLogBucket loadBucket(Key<CommitLogBucket> bucketKey) {
CommitLogBucket bucket = ofy().load().key(bucketKey).now(); CommitLogBucket bucket = ofy().load().key(bucketKey).now();
return bucket == null return (bucket == null)
? new CommitLogBucket.Builder().setBucketNum(bucketKey.getId()).build() ? new CommitLogBucket.Builder().setBucketNum(bucketKey.getId()).build()
: bucket; : bucket;
} }