Run automatic Java 8 conversion over codebase

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171174380

java/google/registry/backup/CommitLogCheckpointStrategy.java

@@ -21,7 +21,6 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME;
 import static google.registry.util.DateTimeUtils.earliestOf;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableMap;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Work;
@@ -167,10 +166,7 @@ class CommitLogCheckpointStrategy {
   ImmutableMap<Integer, DateTime> computeBucketCheckpointTimes(
       ImmutableMap<Integer, DateTime> firstPassTimes,
       final DateTime threshold) {
-    return ImmutableMap.copyOf(transformValues(firstPassTimes, new Function<DateTime, DateTime>() {
-        @Override
-        public DateTime apply(DateTime firstPassTime) {
-          return earliestOf(firstPassTime, threshold);
-        }}));
+    return ImmutableMap.copyOf(
+        transformValues(firstPassTimes, firstPassTime -> earliestOf(firstPassTime, threshold)));
   }
 }

java/google/registry/backup/ExportCommitLogDiffAction.java

@@ -16,6 +16,7 @@ package google.registry.backup;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verifyNotNull;
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Lists.partition;
 import static google.registry.backup.BackupUtils.GcsMetadataKeys.LOWER_BOUND_CHECKPOINT;
@@ -29,15 +30,14 @@ import static google.registry.util.DateTimeUtils.isAtOrAfter;
 import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 import static java.nio.channels.Channels.newOutputStream;
 import static java.util.Arrays.asList;
+import static java.util.Comparator.comparingLong;
 
 import com.google.appengine.tools.cloudstorage.GcsFileOptions;
 import com.google.appengine.tools.cloudstorage.GcsFilename;
 import com.google.appengine.tools.cloudstorage.GcsService;
-import com.google.common.base.Function;
-import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Streams;
 import com.googlecode.objectify.Key;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.model.ImmutableObject;
@@ -52,7 +52,6 @@ import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
@@ -152,21 +151,17 @@ public final class ExportCommitLogDiffAction implements Runnable {
     // transaction-consistent by virtue of our checkpoint strategy and our customized Ofy; see
     // CommitLogCheckpointStrategy for the proof. We break ties by sorting on bucket ID to ensure
     // a deterministic order.
-    return FluentIterable.from(upperCheckpoint.getBucketTimestamps().keySet())
-        .transformAndConcat(new Function<Integer, Iterable<Key<CommitLogManifest>>>() {
-          @Override
-          public Iterable<Key<CommitLogManifest>> apply(Integer bucketNum) {
-            return loadDiffKeysFromBucket(lowerCheckpoint, upperCheckpoint, bucketNum);
-          }})
-        .toSortedList(new Comparator<Key<CommitLogManifest>>() {
-          @Override
-          public int compare(Key<CommitLogManifest> a, Key<CommitLogManifest> b) {
-            // Compare keys by timestamp (which is encoded in the id as millis), then by bucket id.
-            return ComparisonChain.start()
-                .compare(a.getId(), b.getId())
-                .compare(a.getParent().getId(), b.getParent().getId())
-                .result();
-          }});
+    return upperCheckpoint
+        .getBucketTimestamps()
+        .keySet()
+        .stream()
+        .flatMap(
+            bucketNum ->
+                Streams.stream(loadDiffKeysFromBucket(lowerCheckpoint, upperCheckpoint, bucketNum)))
+        .sorted(
+            comparingLong(Key<CommitLogManifest>::getId)
+                .thenComparingLong(a -> a.getParent().getId()))
+        .collect(toImmutableList());
   }
 
   /**

java/google/registry/backup/GcsDiffFileLister.java

@@ -37,7 +37,6 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.concurrent.Callable;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import org.joda.time.DateTime;
@@ -113,12 +112,7 @@ class GcsDiffFileLister {
       final String filename = listItems.next().getName();
       DateTime upperBoundTime = DateTime.parse(filename.substring(DIFF_FILE_PREFIX.length()));
       if (isInRange(upperBoundTime, fromTime, toTime)) {
-        upperBoundTimesToMetadata.put(upperBoundTime, executor.submit(
-            new Callable<GcsFileMetadata>() {
-              @Override
-              public GcsFileMetadata call() throws Exception {
-                return getMetadata(filename);
-              }}));
+        upperBoundTimesToMetadata.put(upperBoundTime, executor.submit(() -> getMetadata(filename)));
         lastUpperBoundTime = latestOf(upperBoundTime, lastUpperBoundTime);
       }
     }

java/google/registry/backup/RestoreCommitLogsAction.java

@@ -52,7 +52,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import javax.inject.Inject;
 import org.joda.time.DateTime;
 
@@ -117,16 +116,16 @@ public class RestoreCommitLogsAction implements Runnable {
       }
     }
     // Restore the CommitLogCheckpointRoot and CommitLogBuckets.
-    saveOfy(FluentIterable.from(bucketTimestamps.entrySet())
-        .transform(new Function<Entry<Integer, DateTime>, ImmutableObject> () {
-          @Override
-          public ImmutableObject apply(Entry<Integer, DateTime> entry) {
-            return new CommitLogBucket.Builder()
-                .setBucketNum(entry.getKey())
-                .setLastWrittenTime(entry.getValue())
-                .build();
-          }})
-        .append(CommitLogCheckpointRoot.create(lastCheckpoint.getCheckpointTime())));
+    saveOfy(
+        FluentIterable.from(bucketTimestamps.entrySet())
+            .transform(
+                (Function<Entry<Integer, DateTime>, ImmutableObject>)
+                    entry ->
+                        new CommitLogBucket.Builder()
+                            .setBucketNum(entry.getKey())
+                            .setLastWrittenTime(entry.getValue())
+                            .build())
+            .append(CommitLogCheckpointRoot.create(lastCheckpoint.getCheckpointTime())));
   }
 
   /**
@@ -153,11 +152,7 @@ public class RestoreCommitLogsAction implements Runnable {
     try {
       deleteResult.now();
     } catch (Exception e) {
-      retry(new Runnable() {
-        @Override
-        public void run() {
-          deleteAsync(manifest.getDeletions()).now();
-        }});
+      retry(() -> deleteAsync(manifest.getDeletions()).now());
     }
     return manifest;
   }
@@ -167,11 +162,7 @@ public class RestoreCommitLogsAction implements Runnable {
       logger.info("Would have saved " + entitiesToSave);
       return;
     }
-    retry(new Runnable() {
-      @Override
-      public void run() {
-        datastoreService.put(entitiesToSave);
-      }});
+    retry(() -> datastoreService.put(entitiesToSave));
   }
 
   private void saveOfy(final Iterable<? extends ImmutableObject> objectsToSave) {
@@ -179,11 +170,7 @@ public class RestoreCommitLogsAction implements Runnable {
       logger.info("Would have saved " + asList(objectsToSave));
       return;
     }
-    retry(new Runnable() {
-      @Override
-      public void run() {
-        ofy().saveWithoutBackup().entities(objectsToSave).now();
-      }});
+    retry(() -> ofy().saveWithoutBackup().entities(objectsToSave).now());
   }
 
   private Result<?> deleteAsync(Set<Key<?>> keysToDelete) {
@@ -198,12 +185,10 @@ public class RestoreCommitLogsAction implements Runnable {
   /** Retrier for saves and deletes, since we can't proceed with any failures. */
   private void retry(final Runnable runnable) {
     retrier.callWithRetry(
-        new Callable<Void>() {
-          @Override
-          public Void call() throws Exception {
-            runnable.run();
-            return null;
-          }},
+        () -> {
+          runnable.run();
+          return null;
+        },
         RuntimeException.class);
   }
 }