Migrate away from VoidWorks

This is one last hanging piece of work left over from last year's Java 8
migration. There's no functionality changes in this CL, just refactoring.

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

java/google/registry/model/ofy/Ofy.java

@@ -309,6 +309,14 @@ public class Ofy {
     throw new AssertionError();  // How on earth did we get here?
   }
 
+  public void transactNewReadOnly(Runnable work) {
+    transactNewReadOnly(
+        () -> {
+          work.run();
+          return null;
+        });
+  }
+
   /** Execute some work in a transactionless context. */
   public <R> R doTransactionless(Work<R> work) {
     try {

java/google/registry/model/registrar/RegistrarContact.java

@@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Streams;
 import com.googlecode.objectify.Key;
-import com.googlecode.objectify.VoidWork;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Index;
@@ -156,22 +155,15 @@ public class RegistrarContact extends ImmutableObject implements Jsonifiable {
       final Registrar registrar, final Set<RegistrarContact> contacts) {
     ofy()
         .transact(
-            new VoidWork() {
-              @Override
-              public void vrun() {
-                ofy()
-                    .delete()
-                    .keys(
-                        difference(
-                            ImmutableSet.copyOf(
-                                ofy()
-                                    .load()
-                                    .type(RegistrarContact.class)
-                                    .ancestor(registrar)
-                                    .keys()),
-                            contacts.stream().map(Key::create).collect(toImmutableSet())));
-                ofy().save().entities(contacts);
-              }
+            () -> {
+              ofy()
+                  .delete()
+                  .keys(
+                      difference(
+                          ImmutableSet.copyOf(
+                              ofy().load().type(RegistrarContact.class).ancestor(registrar).keys()),
+                          contacts.stream().map(Key::create).collect(toImmutableSet())));
+              ofy().save().entities(contacts);
             });
   }
 

java/google/registry/model/registry/label/PremiumListUtils.java

@@ -36,7 +36,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
 import com.googlecode.objectify.Key;
-import com.googlecode.objectify.VoidWork;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.label.DomainLabelMetrics.PremiumListCheckOutcome;
 import google.registry.model.registry.label.PremiumList.PremiumListEntry;
@@ -196,11 +195,7 @@ public final class PremiumListUtils {
 
   /** Deletes the PremiumList and all of its child entities. */
   public static void deletePremiumList(final PremiumList premiumList) {
-    ofy().transactNew(new VoidWork() {
-      @Override
-      public void vrun() {
-        ofy().delete().entity(premiumList);
-      }});
+    ofy().transactNew(() -> ofy().delete().entity(premiumList));
     deleteRevisionAndEntriesOfPremiumList(premiumList);
     cachePremiumLists.invalidate(premiumList.getName());
   }
@@ -209,20 +204,13 @@ public final class PremiumListUtils {
     if (premiumList.getRevisionKey() == null) {
       return;
     }
-    for (final List<Key<PremiumListEntry>> batch : partition(
-        ofy().load().type(PremiumListEntry.class).ancestor(premiumList.revisionKey).keys(),
-        TRANSACTION_BATCH_SIZE)) {
-      ofy().transactNew(new VoidWork() {
-        @Override
-        public void vrun() {
-          ofy().delete().keys(batch);
-        }});
+    for (final List<Key<PremiumListEntry>> batch :
+        partition(
+            ofy().load().type(PremiumListEntry.class).ancestor(premiumList.revisionKey).keys(),
+            TRANSACTION_BATCH_SIZE)) {
+      ofy().transactNew(() -> ofy().delete().keys(batch));
     }
-    ofy().transactNew(new VoidWork() {
-      @Override
-      public void vrun() {
-        ofy().delete().key(premiumList.getRevisionKey());
-      }});
+    ofy().transactNew(() -> ofy().delete().key(premiumList.getRevisionKey()));
   }
 
   /** Returns whether a PremiumList of the given name exists, bypassing the cache. */

java/google/registry/model/server/Lock.java

@@ -22,7 +22,6 @@ import com.google.auto.value.AutoValue;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.google.common.flogger.FluentLogger;
-import com.googlecode.objectify.VoidWork;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import google.registry.model.ImmutableObject;
@@ -216,30 +215,27 @@ public class Lock extends ImmutableObject {
     // Just use the default clock because we aren't actually doing anything that will use the clock.
     ofy()
         .transact(
-            new VoidWork() {
-              @Override
-              public void vrun() {
-                // To release a lock, check that no one else has already obtained it and if not
-                // delete it. If the lock in Datastore was different then this lock is gone already;
-                // this can happen if release() is called around the expiration time and the lock
-                // expires underneath us.
-                Lock loadedLock = ofy().load().type(Lock.class).id(lockId).now();
-                if (Lock.this.equals(loadedLock)) {
-                  // Use noBackupOfy() so that we don't create a commit log entry for deleting the
-                  // lock.
-                  logger.atInfo().log("Deleting lock: %s", lockId);
-                  ofy().deleteWithoutBackup().entity(Lock.this);
-                  lockMetrics.recordRelease(
-                      resourceName, tld, new Duration(acquiredTime, ofy().getTransactionTime()));
-                } else {
-                  logger.atSevere().log(
-                      "The lock we acquired was transferred to someone else before we"
-                          + " released it! Did action take longer than lease length?"
-                          + " Our lock: %s, current lock: %s",
-                      Lock.this, loadedLock);
-                  logger.atInfo().log(
-                      "Not deleting lock: %s - someone else has it: %s", lockId, loadedLock);
-                }
+            () -> {
+              // To release a lock, check that no one else has already obtained it and if not
+              // delete it. If the lock in Datastore was different then this lock is gone already;
+              // this can happen if release() is called around the expiration time and the lock
+              // expires underneath us.
+              Lock loadedLock = ofy().load().type(Lock.class).id(lockId).now();
+              if (Lock.this.equals(loadedLock)) {
+                // Use noBackupOfy() so that we don't create a commit log entry for deleting the
+                // lock.
+                logger.atInfo().log("Deleting lock: %s", lockId);
+                ofy().deleteWithoutBackup().entity(Lock.this);
+                lockMetrics.recordRelease(
+                    resourceName, tld, new Duration(acquiredTime, ofy().getTransactionTime()));
+              } else {
+                logger.atSevere().log(
+                    "The lock we acquired was transferred to someone else before we"
+                        + " released it! Did action take longer than lease length?"
+                        + " Our lock: %s, current lock: %s",
+                    Lock.this, loadedLock);
+                logger.atInfo().log(
+                    "Not deleting lock: %s - someone else has it: %s", lockId, loadedLock);
               }
             });
   }