Remove ClaimsList from Datastore Schema (#1298)

* Remove ClaimsList from Datastore schema

* Remove some Datastore references

* Remove unnecessary annotations

core/src/main/java/google/registry/model/EntityClasses.java

@@ -43,9 +43,6 @@ import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.server.Lock;
 import google.registry.model.server.ServerSecret;
 import google.registry.model.tld.Registry;
-import google.registry.model.tmch.ClaimsList;
-import google.registry.model.tmch.ClaimsList.ClaimsListRevision;
-import google.registry.model.tmch.ClaimsList.ClaimsListSingleton;
 import google.registry.model.tmch.TmchCrl;
 
 /** Sets of classes of the Objectify-registered entities in use throughout the model. */
@@ -59,9 +56,6 @@ public final class EntityClasses {
           BillingEvent.Modification.class,
           BillingEvent.OneTime.class,
           BillingEvent.Recurring.class,
-          ClaimsList.class,
-          ClaimsListRevision.class,
-          ClaimsListSingleton.class,
           CommitLogBucket.class,
           CommitLogCheckpoint.class,
           CommitLogCheckpointRoot.class,

core/src/main/java/google/registry/model/tmch/ClaimsList.java

@@ -17,34 +17,21 @@ package google.registry.model.tmch;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static google.registry.model.IdService.allocateId;
-import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.persistence.transaction.QueryComposer.Comparator.EQ;
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
-import com.googlecode.objectify.Key;
-import com.googlecode.objectify.annotation.Entity;
-import com.googlecode.objectify.annotation.Id;
-import com.googlecode.objectify.annotation.Ignore;
-import com.googlecode.objectify.annotation.Parent;
 import google.registry.model.CreateAutoTimestamp;
 import google.registry.model.ImmutableObject;
-import google.registry.model.annotations.InCrossTld;
-import google.registry.model.annotations.NotBackedUp;
-import google.registry.model.annotations.NotBackedUp.Reason;
-import google.registry.model.annotations.VirtualEntity;
-import google.registry.model.common.CrossTldSingleton;
-import google.registry.model.replay.DatastoreOnlyEntity;
-import google.registry.model.replay.NonReplicatedEntity;
+import google.registry.model.replay.SqlOnlyEntity;
 import google.registry.model.tld.label.ReservedList.ReservedListEntry;
 import java.util.Map;
 import java.util.Optional;
-import javax.annotation.Nullable;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.PostPersist;
 import javax.persistence.PostUpdate;
 import javax.persistence.PreRemove;
@@ -60,26 +47,15 @@ import org.joda.time.DateTime;
  * succeeds, we will end up with having two exact same claims list with only different {@link
  * #revisionId}. However, this is not an actual problem because we only use the claims list with
  * highest {@link #revisionId}.
- *
- * <p>TODO(b/162007765): Remove Datastore related fields and methods.
  */
-@Entity
-@NotBackedUp(reason = Reason.EXTERNALLY_SOURCED)
-@javax.persistence.Entity(name = "ClaimsList")
+@Entity(name = "ClaimsList")
 @Table
-@InCrossTld
-public class ClaimsList extends ImmutableObject implements NonReplicatedEntity {
+public class ClaimsList extends ImmutableObject implements SqlOnlyEntity {
 
-  @Transient @Id long id;
-
-  @Transient @Parent Key<ClaimsListRevision> parent;
-
-  @Ignore
-  @javax.persistence.Id
+  @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   Long revisionId;
 
-  @Ignore
   @Column(nullable = false)
   CreateAutoTimestamp creationTimestamp = CreateAutoTimestamp.create(null);
 
@@ -217,65 +193,8 @@ public class ClaimsList extends ImmutableObject implements NonReplicatedEntity {
   public static ClaimsList create(
       DateTime tmdbGenerationTime, ImmutableMap<String, String> labelsToKeys) {
     ClaimsList instance = new ClaimsList();
-    instance.id = allocateId();
     instance.creationTime = checkNotNull(tmdbGenerationTime);
     instance.labelsToKeys = checkNotNull(labelsToKeys);
     return instance;
   }
-
-  /** Virtual parent entity for claims list shards of a specific revision. */
-  @Entity
-  @VirtualEntity
-  public static class ClaimsListRevision extends ImmutableObject implements DatastoreOnlyEntity {
-    @Parent Key<ClaimsListSingleton> parent;
-
-    @Id long versionId;
-
-    @VisibleForTesting
-    public static Key<ClaimsListRevision> createKey(ClaimsListSingleton singleton) {
-      ClaimsListRevision revision = new ClaimsListRevision();
-      revision.versionId = allocateId();
-      revision.parent = Key.create(singleton);
-      return Key.create(revision);
-    }
-
-    @VisibleForTesting
-    public static Key<ClaimsListRevision> createKey() {
-      return createKey(new ClaimsListSingleton());
-    }
-  }
-
-  /**
-   * Serves as the coordinating claims list singleton linking to the {@link ClaimsListRevision} that
-   * is live.
-   */
-  @Entity
-  @NotBackedUp(reason = Reason.EXTERNALLY_SOURCED)
-  public static class ClaimsListSingleton extends CrossTldSingleton implements DatastoreOnlyEntity {
-    Key<ClaimsListRevision> activeRevision;
-
-    static ClaimsListSingleton create(Key<ClaimsListRevision> revision) {
-      ClaimsListSingleton instance = new ClaimsListSingleton();
-      instance.activeRevision = revision;
-      return instance;
-    }
-
-    @VisibleForTesting
-    public void setActiveRevision(Key<ClaimsListRevision> revision) {
-      activeRevision = revision;
-    }
-  }
-
-  /**
-   * Returns the current ClaimsListRevision if there is one, or null if no claims list revisions
-   * have ever been persisted yet.
-   */
-  @Nullable
-  public static Key<ClaimsListRevision> getCurrentRevision() {
-    ClaimsListSingleton singleton = auditedOfy().load().entity(new ClaimsListSingleton()).now();
-    return singleton == null ? null : singleton.activeRevision;
-  }
-
-  /** Exception when trying to directly save a {@link ClaimsList} without sharding. */
-  public static class UnshardedSaveException extends RuntimeException {}
 }

core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java

@@ -40,7 +40,6 @@ import google.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex;
 import google.registry.model.ofy.DatastoreTransactionManager;
 import google.registry.model.replay.NonReplicatedEntity;
 import google.registry.model.replay.SqlOnlyEntity;
-import google.registry.model.tmch.ClaimsList.ClaimsListSingleton;
 import google.registry.persistence.JpaRetries;
 import google.registry.persistence.VKey;
 import google.registry.util.Clock;
@@ -90,7 +89,6 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager {
   // TODO(b/176108270): Remove this property after database migration.
   private static final ImmutableSet<Class<? extends ImmutableObject>> IGNORED_ENTITY_CLASSES =
       ImmutableSet.of(
-          ClaimsListSingleton.class,
           EppResourceIndex.class,
           ForeignKeyContactIndex.class,
           ForeignKeyDomainIndex.class,

core/src/main/java/google/registry/tmch/TmchDnlAction.java

@@ -46,7 +46,7 @@ public final class TmchDnlAction implements Runnable {
   @Inject @Key("marksdbDnlLoginAndPassword") Optional<String> marksdbDnlLoginAndPassword;
   @Inject TmchDnlAction() {}
 
-  /** Synchronously fetches latest domain name list and saves it to Datastore. */
+  /** Synchronously fetches latest domain name list and saves it to Cloud SQL. */
   @Override
   public void run() {
     List<String> lines;