Convert RDE classes to use tm() (#1044)

This is mostly just using the generic Cursor load methods with the slight difference that before we relied on ofy() returning null on absent entities.
2026-06-09 16:33:02 +00:00 · 2021-03-30 13:09:33 -04:00
parent 5c6b2595db
commit b90b9af80e
10 changed files with 102 additions and 70 deletions
--- a/core/src/main/java/google/registry/model/rde/RdeRevision.java
+++ b/core/src/main/java/google/registry/model/rde/RdeRevision.java
@@ -17,6 +17,7 @@ package google.registry.model.rde;
 import static com.google.common.base.Preconditions.checkArgument;
 import static google.registry.model.rde.RdeNamingUtils.makePartialName;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm;

 import com.google.common.base.VerifyException;
 import com.googlecode.objectify.Key;
@@ -97,7 +98,8 @@ public final class RdeRevision extends BackupGroupRoot implements NonReplicatedE
    RdeRevisionId sqlKey = RdeRevisionId.create(tld, date.toLocalDate(), mode);
    Key<RdeRevision> ofyKey = Key.create(RdeRevision.class, id);
    Optional<RdeRevision> revisionOptional =
-        tm().loadByKeyIfPresent(VKey.create(RdeRevision.class, sqlKey, ofyKey));
+        transactIfJpaTm(
+            () -> tm().loadByKeyIfPresent(VKey.create(RdeRevision.class, sqlKey, ofyKey)));
    return revisionOptional.map(rdeRevision -> rdeRevision.revision + 1).orElse(0);
  }

--- a/core/src/main/java/google/registry/rde/EscrowTaskRunner.java
+++ b/core/src/main/java/google/registry/rde/EscrowTaskRunner.java
@@ -14,8 +14,8 @@

 package google.registry.rde;

-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm;

 import com.google.common.flogger.FluentLogger;
 import google.registry.model.common.Cursor;
@@ -90,8 +90,13 @@ class EscrowTaskRunner {
        () -> {
          logger.atInfo().log("TLD: %s", registry.getTld());
          DateTime startOfToday = clock.nowUtc().withTimeAtStartOfDay();
-          Cursor cursor = ofy().load().key(Cursor.createKey(cursorType, registry)).now();
-          final DateTime nextRequiredRun = (cursor == null ? startOfToday : cursor.getCursorTime());
+          DateTime nextRequiredRun =
+              transactIfJpaTm(
+                      () ->
+                          tm().loadByKeyIfPresent(
+                                  Cursor.createVKey(cursorType, registry.getTldStr())))
+                  .map(Cursor::getCursorTime)
+                  .orElse(startOfToday);
          if (nextRequiredRun.isAfter(startOfToday)) {
            throw new NoContentException("Already completed");
          }
--- a/core/src/main/java/google/registry/rde/PendingDepositChecker.java
+++ b/core/src/main/java/google/registry/rde/PendingDepositChecker.java
@@ -15,8 +15,8 @@
 package google.registry.rde;

 import static com.google.common.base.Preconditions.checkArgument;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm;
 import static google.registry.util.DateTimeUtils.isBeforeOrAt;

 import com.google.common.collect.ImmutableSetMultimap;
@@ -28,6 +28,7 @@ import google.registry.model.registry.Registries;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldType;
 import google.registry.util.Clock;
+import java.util.Optional;
 import javax.inject.Inject;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
@@ -89,13 +90,15 @@ public final class PendingDepositChecker {
        continue;
      }
      // Avoid creating a transaction unless absolutely necessary.
-      Cursor cursor = ofy().load().key(Cursor.createKey(cursorType, registry)).now();
-      DateTime cursorValue = (cursor != null ? cursor.getCursorTime() : startingPoint);
+      Optional<Cursor> maybeCursor =
+          transactIfJpaTm(
+              () -> tm().loadByKeyIfPresent(Cursor.createVKey(cursorType, registry.getTldStr())));
+      DateTime cursorValue = maybeCursor.map(Cursor::getCursorTime).orElse(startingPoint);
      if (isBeforeOrAt(cursorValue, now)) {
        DateTime watermark =
-            (cursor != null
-                ? cursor.getCursorTime()
-                : transactionallyInitializeCursor(registry, cursorType, startingPoint));
+            maybeCursor
+                .map(Cursor::getCursorTime)
+                .orElse(transactionallyInitializeCursor(registry, cursorType, startingPoint));
        if (isBeforeOrAt(watermark, now)) {
          builder.put(tld, PendingDeposit.create(tld, watermark, mode, cursorType, interval));
        }
@@ -108,9 +111,10 @@ public final class PendingDepositChecker {
      final Registry registry, final CursorType cursorType, final DateTime initialValue) {
    return tm().transact(
            () -> {
-              Cursor cursor = ofy().load().key(Cursor.createKey(cursorType, registry)).now();
-              if (cursor != null) {
-                return cursor.getCursorTime();
+              Optional<Cursor> maybeCursor =
+                  tm().loadByKeyIfPresent(Cursor.createVKey(cursorType, registry.getTldStr()));
+              if (maybeCursor.isPresent()) {
+                return maybeCursor.get().getCursorTime();
              }
              tm().put(Cursor.create(cursorType, initialValue, registry));
              return initialValue;
--- a/core/src/main/java/google/registry/rde/RdeReportAction.java
+++ b/core/src/main/java/google/registry/rde/RdeReportAction.java
@@ -17,8 +17,9 @@ package google.registry.rde;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
 import static google.registry.model.common.Cursor.getCursorTimeOrStartOfTime;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.model.rde.RdeMode.FULL;
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm;
 import static google.registry.request.Action.Method.POST;
 import static google.registry.util.DateTimeUtils.isBeforeOrAt;

@@ -77,7 +78,7 @@ public final class RdeReportAction implements Runnable, EscrowTask {
  @Override
  public void runWithLock(DateTime watermark) throws Exception {
    Cursor cursor =
-        ofy().load().key(Cursor.createKey(CursorType.RDE_UPLOAD, Registry.get(tld))).now();
+        transactIfJpaTm(() -> tm().loadByKey(Cursor.createVKey(CursorType.RDE_UPLOAD, tld)));
    DateTime cursorTime = getCursorTimeOrStartOfTime(cursor);
    if (isBeforeOrAt(cursorTime, watermark)) {
      throw new NoContentException(
--- a/core/src/main/java/google/registry/rde/RdeUploadAction.java
+++ b/core/src/main/java/google/registry/rde/RdeUploadAction.java
@@ -18,12 +18,14 @@ import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl;
 import static com.google.common.base.Verify.verify;
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
 import static com.jcraft.jsch.ChannelSftp.OVERWRITE;
+import static google.registry.model.common.Cursor.CursorType.RDE_STAGING;
 import static google.registry.model.common.Cursor.CursorType.RDE_UPLOAD_SFTP;
 import static google.registry.model.common.Cursor.getCursorTimeOrStartOfTime;
-import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.model.rde.RdeMode.FULL;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm;
 import static google.registry.request.Action.Method.POST;
+import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import static google.registry.util.DateTimeUtils.isBeforeOrAt;
 import static java.util.Arrays.asList;

@@ -131,8 +133,7 @@ public final class RdeUploadAction implements Runnable, EscrowTask {
  @Override
  public void runWithLock(final DateTime watermark) throws Exception {
    logger.atInfo().log("Verifying readiness to upload the RDE deposit.");
-    Cursor cursor =
-        ofy().load().key(Cursor.createKey(CursorType.RDE_STAGING, Registry.get(tld))).now();
+    Cursor cursor = transactIfJpaTm(() -> tm().loadByKey(Cursor.createVKey(RDE_STAGING, tld)));
    DateTime stagingCursorTime = getCursorTimeOrStartOfTime(cursor);
    if (isBeforeOrAt(stagingCursorTime, watermark)) {
      throw new NoContentException(
@@ -141,9 +142,10 @@ public final class RdeUploadAction implements Runnable, EscrowTask {
                  + "last RDE staging completion was at %s",
              tld, watermark, stagingCursorTime));
    }
-    Cursor sftpCursor =
-        ofy().load().key(Cursor.createKey(RDE_UPLOAD_SFTP, Registry.get(tld))).now();
-    DateTime sftpCursorTime = getCursorTimeOrStartOfTime(sftpCursor);
+    DateTime sftpCursorTime =
+        transactIfJpaTm(() -> tm().loadByKeyIfPresent(Cursor.createVKey(RDE_UPLOAD_SFTP, tld)))
+            .map(Cursor::getCursorTime)
+            .orElse(START_OF_TIME);
    Duration timeSinceLastSftp = new Duration(sftpCursorTime, clock.nowUtc());
    if (timeSinceLastSftp.isShorterThan(sftpCooldown)) {
      throw new NoContentException(