Remove ofy from Lock (#1771)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/google/nomulus/1771)
<!-- Reviewable:end -->

core/src/test/java/google/registry/model/common/ClassPathManagerTest.java

@@ -27,7 +27,6 @@ import google.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex;
 import google.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex;
 import google.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.server.Lock;
 import google.registry.model.server.ServerSecret;
 import google.registry.testing.TestObject;
 import org.junit.jupiter.api.Test;
@@ -53,7 +52,6 @@ public class ClassPathManagerTest {
     assertThat(ClassPathManager.getClass("EppResourceIndexBucket"))
         .isEqualTo(EppResourceIndexBucket.class);
     assertThat(ClassPathManager.getClass("EntityGroupRoot")).isEqualTo(EntityGroupRoot.class);
-    assertThat(ClassPathManager.getClass("Lock")).isEqualTo(Lock.class);
     assertThat(ClassPathManager.getClass("Domain")).isEqualTo(Domain.class);
     assertThat(ClassPathManager.getClass("HistoryEntry")).isEqualTo(HistoryEntry.class);
     assertThat(ClassPathManager.getClass("ForeignKeyHostIndex"))
@@ -103,7 +101,6 @@ public class ClassPathManagerTest {
     assertThat(ClassPathManager.getClassName(EppResourceIndexBucket.class))
         .isEqualTo("EppResourceIndexBucket");
     assertThat(ClassPathManager.getClassName(EntityGroupRoot.class)).isEqualTo("EntityGroupRoot");
-    assertThat(ClassPathManager.getClassName(Lock.class)).isEqualTo("Lock");
     assertThat(ClassPathManager.getClassName(Domain.class)).isEqualTo("Domain");
     assertThat(ClassPathManager.getClassName(HistoryEntry.class)).isEqualTo("HistoryEntry");
     assertThat(ClassPathManager.getClassName(ForeignKeyHostIndex.class))

core/src/test/java/google/registry/model/server/LockTest.java

@@ -49,7 +49,8 @@ public class LockTest extends EntityTestCase {
     super(JpaEntityCoverageCheck.ENABLED);
   }
 
-  private Optional<Lock> acquire(String tld, Duration leaseLength, LockState expectedLockState) {
+  private static Optional<Lock> acquire(
+      String tld, Duration leaseLength, LockState expectedLockState) {
     Lock.lockMetrics = mock(LockMetrics.class);
     Optional<Lock> lock = Lock.acquire(RESOURCE_NAME, tld, leaseLength, requestStatusChecker, true);
     verify(Lock.lockMetrics).recordAcquire(RESOURCE_NAME, tld, expectedLockState);
@@ -58,7 +59,7 @@ public class LockTest extends EntityTestCase {
     return lock;
   }
 
-  private void release(Lock lock, String expectedTld, long expectedMillis) {
+  private static void release(Lock lock, String expectedTld, long expectedMillis) {
     Lock.lockMetrics = mock(LockMetrics.class);
     lock.release();
     verify(Lock.lockMetrics)

core/src/test/java/google/registry/request/lock/LockHandlerImplTest.java

@@ -44,7 +44,7 @@ final class LockHandlerImplTest {
   final AppEngineExtension appEngine = AppEngineExtension.builder().withCloudSql().build();
 
   private static class CountingCallable implements Callable<Void> {
-    int numCalled = 0;
+    int numCalled;
 
     @Override
     public Void call() {
@@ -69,16 +69,11 @@ final class LockHandlerImplTest {
     }
   }
 
-  private boolean executeWithLocks(Callable<Void> callable, final @Nullable Lock acquiredLock) {
+  private boolean executeWithLocks(Callable<Void> callable, @Nullable final Lock acquiredLock) {
     return createTestLockHandler(acquiredLock)
         .executeWithLocks(callable, "tld", ONE_DAY, "resourceName");
   }
 
-  private boolean executeWithSqlLocks(Callable<Void> callable, final @Nullable Lock acquiredLock) {
-    return createTestLockHandler(acquiredLock)
-        .executeWithSqlLocks(callable, "tld", ONE_DAY, "resourceName");
-  }
-
   @Test
   void testLockSucceeds() {
     Lock lock = mock(Lock.class);
@@ -88,15 +83,6 @@ final class LockHandlerImplTest {
     verify(lock, times(1)).release();
   }
 
-  @Test
-  void testSqlLockSucceeds() {
-    Lock lock = mock(Lock.class);
-    CountingCallable countingCallable = new CountingCallable();
-    assertThat(executeWithSqlLocks(countingCallable, lock)).isTrue();
-    assertThat(countingCallable.numCalled).isEqualTo(1);
-    verify(lock, times(1)).release();
-  }
-
   @Test
   void testLockSucceeds_uncheckedException() {
     Lock lock = mock(Lock.class);
@@ -157,11 +143,6 @@ final class LockHandlerImplTest {
         assertThat(leaseLength).isEqualTo(ONE_DAY);
         return Optional.ofNullable(acquiredLock);
       }
-
-      @Override
-      Optional<Lock> acquireSql(String resourceName, String tld, Duration leaseLength) {
-        return acquire(resourceName, tld, leaseLength);
-      }
     };
   }
 }

core/src/test/java/google/registry/testing/FakeLockHandler.java

@@ -42,12 +42,6 @@ public class FakeLockHandler implements LockHandler {
     return execute(callable);
   }
 
-  @Override
-  public boolean executeWithSqlLocks(
-      Callable<Void> callable, @Nullable String tld, Duration leaseLength, String... lockNames) {
-    return execute(callable);
-  }
-
   private boolean execute(Callable<Void> callable) {
     if (!lockSucceeds) {
       return false;

core/src/test/resources/google/registry/model/schema.txt

@@ -389,14 +389,6 @@ enum google.registry.model.reporting.HistoryEntry$Type {
   RDE_IMPORT;
   SYNTHETIC;
 }
-class google.registry.model.server.Lock {
-  @Id java.lang.String lockId;
-  java.lang.String requestLogId;
-  java.lang.String resourceName;
-  java.lang.String tld;
-  org.joda.time.DateTime acquiredTime;
-  org.joda.time.DateTime expirationTime;
-}
 class google.registry.model.server.ServerSecret {
   @Id long id;
   @Parent com.googlecode.objectify.Key<google.registry.model.common.EntityGroupRoot> parent;